diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index fb681dcd..7258b608 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,6 +1,10 @@ name: Python Formatting (run ./bw-dev black to fix) -on: [push, pull_request] +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] jobs: lint: diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 850a4be3..03147744 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -51,6 +51,6 @@ jobs: EMAIL_HOST_USER: "" EMAIL_HOST_PASSWORD: "" EMAIL_USE_TLS: true - ENABLE_PREVIEW_IMAGES: true + ENABLE_PREVIEW_IMAGES: false run: | pytest -n 3 diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml index 1a32940f..1b14149f 100644 --- a/.github/workflows/pylint.yml +++ b/.github/workflows/pylint.yml @@ -1,6 +1,10 @@ name: Pylint -on: [push, pull_request] +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] jobs: build: diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index fbb38da2..6d65974a 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -7,11 +7,10 @@ from bookwyrm import models class Author(TestCase): def setUp(self): - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.author = models.Author.objects.create( name="Author fullname", aliases=["One", "Two"], diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 9a88b1c6..77844a22 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -25,25 +25,24 @@ class BaseActivity(TestCase): def setUp(self): """we're probably going to re-use this so why copy/paste""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - self.user.remote_id = "http://example.com/a/b" - self.user.save(broadcast=False) + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + self.user.remote_id = "http://example.com/a/b" + self.user.save(broadcast=False) - datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") - self.userdata = json.loads(datafile.read_bytes()) - # don't try to load the user icon - del self.userdata["icon"] + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + self.userdata = json.loads(datafile.read_bytes()) + # don't try to load the user icon + del self.userdata["icon"] - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - self.image_data = output.getvalue() + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + self.image_data = output.getvalue() def test_init(self, _): """simple successfuly init""" @@ -98,11 +97,10 @@ class BaseActivity(TestCase): status=200, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = resolve_remote_id( - "https://example.com/user/mouse", model=models.User - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = resolve_remote_id( + "https://example.com/user/mouse", model=models.User + ) self.assertIsInstance(result, models.User) self.assertEqual(result.remote_id, "https://example.com/user/mouse") self.assertEqual(result.name, "MOUSE?? MOUSE!!") @@ -141,9 +139,8 @@ class BaseActivity(TestCase): self.user.avatar.file # pylint: disable=pointless-statement # this would trigger a broadcast because it's a local user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - activity.to_model(model=models.User, instance=self.user) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + activity.to_model(model=models.User, instance=self.user) self.assertIsNotNone(self.user.avatar.file) self.assertEqual(self.user.name, "New Name") self.assertEqual(self.user.key_pair.public_key, "hi") @@ -155,10 +152,9 @@ class BaseActivity(TestCase): content="test status", user=self.user, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) update_data = activitypub.Note( id=status.remote_id, content=status.content, diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py index 20dbcdfb..67aaf891 100644 --- a/bookwyrm/tests/activitypub/test_person.py +++ b/bookwyrm/tests/activitypub/test_person.py @@ -20,9 +20,8 @@ class Person(TestCase): def test_user_to_model(self): activity = activitypub.Person(**self.user_data) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = activity.to_model(model=models.User) + with patch("bookwyrm.models.user.set_remote_server.delay"): + user = activity.to_model(model=models.User) self.assertEqual(user.username, "mouse@example.com") self.assertEqual(user.remote_id, "https://example.com/user/mouse") self.assertFalse(user.local) diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index 59d4b1b6..c90348bc 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -12,22 +12,20 @@ class Quotation(TestCase): def setUp(self): """model objects we'll need""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.user = models.User.objects.create_user( - "mouse", - "mouse@mouse.mouse", - "mouseword", - local=False, - inbox="https://example.com/user/mouse/inbox", - outbox="https://example.com/user/mouse/outbox", - remote_id="https://example.com/user/mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.user = models.User.objects.create_user( + "mouse", + "mouse@mouse.mouse", + "mouseword", + local=False, + inbox="https://example.com/user/mouse/inbox", + outbox="https://example.com/user/mouse/outbox", + remote_id="https://example.com/user/mouse", ) + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json") self.status_data = json.loads(datafile.read_bytes()) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 4390a220..5c50e4b7 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -74,12 +74,11 @@ class AbstractConnector(TestCase): Mapping("openlibraryKey"), ] - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1234", - openlibrary_key="OL1234M", - ) + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1234", + openlibrary_key="OL1234M", + ) def test_abstract_connector_init(self): """barebones connector for search with defaults""" @@ -111,11 +110,8 @@ class AbstractConnector(TestCase): responses.add( responses.GET, "https://example.com/book/abcd", json=self.edition_data ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): - result = self.connector.get_or_create_book( - "https://example.com/book/abcd" - ) + with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): + result = self.connector.get_or_create_book("https://example.com/book/abcd") self.assertEqual(result, self.book) self.assertEqual(models.Edition.objects.count(), 1) self.assertEqual(models.Edition.objects.count(), 1) diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py index 3a2480de..46ea54a9 100644 --- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -1,5 +1,4 @@ """ testing book data connectors """ -from unittest.mock import patch import json import pathlib from django.test import TestCase @@ -26,9 +25,8 @@ class BookWyrmConnector(TestCase): def test_get_or_create_book_existing(self): """load book activity""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - book = models.Edition.objects.create(title="Test Edition", parent_work=work) + work = models.Work.objects.create(title="Test Work") + book = models.Edition.objects.create(title="Test Edition", parent_work=work) result = self.connector.get_or_create_book(book.remote_id) self.assertEqual(book, result) diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index 95920f07..67b108dd 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -1,5 +1,4 @@ """ interface between the app and various connectors """ -from unittest.mock import patch from django.test import TestCase import responses @@ -14,15 +13,14 @@ class ConnectorManager(TestCase): def setUp(self): """we'll need some books and a connector info entry""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Example Work") + self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work, isbn_10="0000000000" - ) - self.edition = models.Edition.objects.create( - title="Another Edition", parent_work=self.work, isbn_10="1111111111" - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work, isbn_10="0000000000" + ) + self.edition = models.Edition.objects.create( + title="Another Edition", parent_work=self.work, isbn_10="1111111111" + ) self.connector = models.Connector.objects.create( identifier="test_connector", diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 1cca34d6..699b26ed 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -178,26 +178,20 @@ class Openlibrary(TestCase): @responses.activate def test_expand_book_data(self): """given a book, get more editions""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create( - title="Test Work", openlibrary_key="OL1234W" - ) - edition = models.Edition.objects.create( - title="Test Edition", parent_work=work - ) + work = models.Work.objects.create(title="Test Work", openlibrary_key="OL1234W") + edition = models.Edition.objects.create(title="Test Edition", parent_work=work) responses.add( responses.GET, "https://openlibrary.org/works/OL1234W/editions", json={"entries": []}, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.connectors.abstract_connector.AbstractConnector." - "create_edition_from_data" - ): - self.connector.expand_book_data(edition) - self.connector.expand_book_data(work) + with patch( + "bookwyrm.connectors.abstract_connector.AbstractConnector." + "create_edition_from_data" + ): + self.connector.expand_book_data(edition) + self.connector.expand_book_data(work) def test_get_description(self): """should do some cleanup on the description data""" @@ -230,14 +224,11 @@ class Openlibrary(TestCase): json={"hi": "there"}, status=200, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch( - "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" - ) as mock: - mock.return_value = [] - result = self.connector.create_edition_from_data( - work, self.edition_data - ) + with patch( + "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" + ) as mock: + mock.return_value = [] + result = self.connector.create_edition_from_data(work, self.edition_data) self.assertEqual(result.parent_work, work) self.assertEqual(result.title, "Sabriel") self.assertEqual(result.isbn_10, "0060273224") diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index 02c0c9a4..86aa7add 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -1,5 +1,4 @@ """ testing book data connectors """ -from unittest.mock import patch import datetime from django.test import TestCase from django.utils import timezone @@ -30,21 +29,19 @@ class SelfConnector(TestCase): def test_format_search_result(self): """create a SearchResult""" author = models.Author.objects.create(name="Anonymous") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - edition = models.Edition.objects.create( - title="Edition of Example Work", - published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), - ) - edition.authors.add(author) - result = self.connector.search("Edition of Example")[0] + edition = models.Edition.objects.create( + title="Edition of Example Work", + published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), + ) + edition.authors.add(author) + result = self.connector.search("Edition of Example")[0] self.assertEqual(result.title, "Edition of Example Work") self.assertEqual(result.key, edition.remote_id) self.assertEqual(result.author, "Anonymous") self.assertEqual(result.year, 1980) self.assertEqual(result.connector, self.connector) - @patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay") - def test_search_rank(self, _): + def test_search_rank(self): """prioritize certain results""" author = models.Author.objects.create(name="Anonymous") edition = models.Edition.objects.create( @@ -81,8 +78,7 @@ class SelfConnector(TestCase): self.assertEqual(results[2].title, "Edition of Example Work") self.assertEqual(results[3].title, "Another Edition") - @patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay") - def test_search_multiple_editions(self, _): + def test_search_multiple_editions(self): """it should get rid of duplicate editions for the same work""" work = models.Work.objects.create(title="Work Title") edition_1 = models.Edition.objects.create( diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index 49944474..8a0b25ec 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -27,10 +27,9 @@ class GoodreadsImport(TestCase): self.importer = GoodreadsImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") self.csv = open(datafile, "r", encoding=self.importer.encoding) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True - ) + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True + ) models.Connector.objects.create( identifier=DOMAIN, @@ -43,13 +42,12 @@ class GoodreadsImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_create_job(self): """creates the import job entry and checks csv""" @@ -100,8 +98,7 @@ class GoodreadsImport(TestCase): def test_import_data(self): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create(title="Test Book") + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -128,11 +125,10 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -196,14 +192,13 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -228,11 +223,10 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.Review.objects.get(book=self.book, user=self.user) self.assertEqual(review.content, "mixed feelings") self.assertEqual(review.rating, 2) @@ -253,11 +247,10 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.ReviewRating.objects.get(book=self.book, user=self.user) self.assertIsInstance(review, models.ReviewRating) self.assertEqual(review.rating, 2) @@ -275,11 +268,10 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "unlisted" + ) self.assertFalse( models.Review.objects.filter(book=self.book, user=self.user).exists() ) diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 1e4911b4..0bdfb263 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -15,6 +15,7 @@ from bookwyrm.settings import DOMAIN def make_date(*args): + """helper function to easily generate a date obj""" return datetime.datetime(*args, tzinfo=pytz.UTC) @@ -28,10 +29,9 @@ class LibrarythingImport(TestCase): # Librarything generates latin encoded exports... self.csv = open(datafile, "r", encoding=self.importer.encoding) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "mmai", "mmai@mmai.mmai", "password", local=True - ) + self.user = models.User.objects.create_user( + "mmai", "mmai@mmai.mmai", "password", local=True + ) models.Connector.objects.create( identifier=DOMAIN, @@ -44,13 +44,12 @@ class LibrarythingImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_create_job(self): """creates the import job entry and checks csv""" @@ -90,8 +89,7 @@ class LibrarythingImport(TestCase): def test_import_data(self): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create(title="Test Book") + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -120,11 +118,10 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -152,11 +149,10 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -182,14 +178,13 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -211,11 +206,10 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.Review.objects.get(book=self.book, user=self.user) self.assertEqual(review.content, "chef d'oeuvre") self.assertEqual(review.rating, 5) @@ -233,11 +227,10 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "unlisted" + ) self.assertFalse( models.Review.objects.filter(book=self.book, user=self.user).exists() ) diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index 1705cd34..ddbce7d3 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -12,29 +12,27 @@ class Activitystreams(TestCase): def setUp(self): """we need some stuff""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + self.another_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.another_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.nutria", - "password", - local=True, - localname="nutria", - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test book") + self.book = models.Edition.objects.create(title="test book") def test_populate_streams(self, _): """make sure the function on the redis manager gets called""" diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 553ca546..6d8fe270 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -21,28 +21,27 @@ from bookwyrm.settings import PAGE_LENGTH # pylint: disable=invalid-name @patch("bookwyrm.activitystreams.ActivityStream.add_status") -@patch("bookwyrm.preview_images.generate_user_preview_image_task.delay") +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") class ActivitypubMixins(TestCase): """functionality shared across models""" def setUp(self): """shared data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.local_user.remote_id = "http://example.com/a/b" + 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", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "http://example.com/a/b" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) self.object_mock = { "to": "to field", @@ -78,22 +77,20 @@ class ActivitypubMixins(TestCase): """attempt to match a remote id to an object in the db""" # uses a different remote id scheme # this isn't really part of this test directly but it's helpful to state - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) self.assertEqual(book.origin_id, "http://book.com/book") self.assertNotEqual(book.remote_id, "http://book.com/book") # uses subclasses - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.Comment.objects.create( - user=self.local_user, - content="test status", - book=book, - remote_id="https://comment.net", - ) + models.Comment.objects.create( + user=self.local_user, + content="test status", + book=book, + remote_id="https://comment.net", + ) result = models.User.find_existing_by_remote_id("hi") self.assertIsNone(result) @@ -110,11 +107,10 @@ class ActivitypubMixins(TestCase): def test_find_existing(self, *_): """match a blob of data to a model""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test edition", - openlibrary_key="OL1234", - ) + book = models.Edition.objects.create( + title="Test edition", + openlibrary_key="OL1234", + ) result = models.Edition.find_existing({"openlibraryKey": "OL1234"}) self.assertEqual(result, book) @@ -369,7 +365,6 @@ class ActivitypubMixins(TestCase): self.assertEqual(activity["type"], "Undo") self.assertIsInstance(activity["object"], dict) - @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") def test_to_ordered_collection_page(self, *_): """make sure the paged results of an ordered collection work""" self.assertEqual(PAGE_LENGTH, 15) @@ -395,7 +390,6 @@ class ActivitypubMixins(TestCase): self.assertEqual(page_2.orderedItems[0]["content"], "test status 14") self.assertEqual(page_2.orderedItems[-1]["content"], "test status 0") - @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") def test_to_ordered_collection(self, *_): """convert a queryset into an ordered collection object""" self.assertEqual(PAGE_LENGTH, 15) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 496a8610..e140887a 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -7,25 +7,25 @@ from bookwyrm.models import base_model from bookwyrm.settings import DOMAIN +# pylint: disable=attribute-defined-outside-init class BaseModel(TestCase): """functionality shared across models""" def setUp(self): """shared data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) class BookWyrmTestModel(base_model.BookWyrmModel): """just making it not abstract""" diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index 9408220e..cad00d43 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -1,6 +1,4 @@ """ testing models """ -from unittest.mock import patch - from dateutil.parser import parse from django.test import TestCase from django.utils import timezone @@ -14,18 +12,17 @@ class Book(TestCase): def setUp(self): """we'll need some books""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create( - title="Example Work", remote_id="https://example.com/book/1" - ) - self.first_edition = models.Edition.objects.create( - title="Example Edition", - parent_work=self.work, - ) - self.second_edition = models.Edition.objects.create( - title="Another Example Edition", - parent_work=self.work, - ) + self.work = models.Work.objects.create( + title="Example Work", remote_id="https://example.com/book/1" + ) + self.first_edition = models.Edition.objects.create( + title="Example Edition", + parent_work=self.work, + ) + self.second_edition = models.Edition.objects.create( + title="Another Example Edition", + parent_work=self.work, + ) def test_remote_id(self): """fanciness with remote/origin ids""" @@ -59,8 +56,7 @@ class Book(TestCase): def test_get_edition_info(self): """text slug about an edition""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create(title="Test Edition") + book = models.Edition.objects.create(title="Test Edition") self.assertEqual(book.edition_info, "") book.physical_format = "worm" diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py index fabd69ee..43724568 100644 --- a/bookwyrm/tests/models/test_federated_server.py +++ b/bookwyrm/tests/models/test_federated_server.py @@ -11,30 +11,29 @@ class FederatedServer(TestCase): def setUp(self): """we'll need a user""" self.server = models.FederatedServer.objects.create(server_name="test.server") - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - federated_server=self.server, - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - self.inactive_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - federated_server=self.server, - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - is_active=False, - deactivation_reason="self_deletion", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + federated_server=self.server, + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + self.inactive_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + federated_server=self.server, + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + is_active=False, + deactivation_reason="self_deletion", + ) def test_block_unblock(self): """block a server and all users on it""" diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 339d3568..a8a6096b 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -188,10 +188,9 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_privacy_field_set_activity_from_field(self, *_): """translate between to/cc fields and privacy""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) public = "https://www.w3.org/ns/activitystreams#Public" followers = "%s/followers" % user.remote_id @@ -249,20 +248,19 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + unrelated_user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) - # test receiving an unknown remote id and loading data - responses.add( - responses.GET, - "https://example.com/user/mouse", - json=userdata, - status=200, - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity("https://example.com/user/mouse") + # test receiving an unknown remote id and loading data + responses.add( + responses.GET, + "https://example.com/user/mouse", + json=userdata, + status=200, + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity("https://example.com/user/mouse") self.assertIsInstance(value, User) self.assertNotEqual(value, unrelated_user) self.assertEqual(value.remote_id, "https://example.com/user/mouse") @@ -277,12 +275,11 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + unrelated_user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertIsInstance(value, User) self.assertNotEqual(value, unrelated_user) self.assertEqual(value.remote_id, "https://example.com/user/mouse") @@ -294,31 +291,29 @@ class ActivitypubFields(TestCase): instance = fields.ForeignKey(User, on_delete=models.CASCADE) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") userdata = json.loads(datafile.read_bytes()) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - user.remote_id = "https://example.com/user/mouse" - user.save(broadcast=False) + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + user.remote_id = "https://example.com/user/mouse" + user.save(broadcast=False) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) - with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): + value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertEqual(value, user) def test_foreign_key_from_activity_str_existing(self): """test receiving a remote id of an existing object in the db""" instance = fields.ForeignKey(User, on_delete=models.CASCADE) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) value = instance.field_from_activity(user.remote_id) self.assertEqual(value, user) @@ -360,11 +355,10 @@ class ActivitypubFields(TestCase): responses.add( responses.GET, "https://example.com/user/mouse", json=userdata, status=200 ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity( - ["https://example.com/user/mouse", "bleh"] - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity( + ["https://example.com/user/mouse", "bleh"] + ) self.assertIsInstance(value, list) self.assertEqual(len(value), 1) self.assertIsInstance(value[0], User) @@ -396,17 +390,16 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast") def test_image_field(self, _): """storing images""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - user.avatar.save("test.jpg", ContentFile(output.getvalue())) + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + user.avatar.save("test.jpg", ContentFile(output.getvalue())) output = fields.image_serializer(user.avatar, alt="alt text") self.assertIsNotNone( diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index be6702b3..76a914d1 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -59,10 +59,9 @@ class ImportJob(TestCase): unknown_read_data["Exclusive Shelf"] = "read" unknown_read_data["Date Read"] = "" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) job = models.ImportJob.objects.create(user=user) self.item_1 = models.ImportItem.objects.create( job=job, index=1, data=currently_reading_data @@ -175,9 +174,6 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - book = self.item_1.get_book_from_isbn() + book = self.item_1.get_book_from_isbn() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index 34517ddc..8f5bd497 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -11,13 +11,11 @@ class List(TestCase): def setUp(self): """look, a list""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="hello") - self.book = models.Edition.objects.create(title="hi", parent_work=work) + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + work = models.Work.objects.create(title="hello") + self.book = models.Edition.objects.create(title="hi", parent_work=work) def test_remote_id(self, _): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 186e7ad0..a8d74e54 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -1,7 +1,6 @@ """ testing models """ from django.test import TestCase from django.core.exceptions import ValidationError -from unittest.mock import patch from bookwyrm import models @@ -11,16 +10,14 @@ class ReadThrough(TestCase): def setUp(self): """look, a shelf""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + self.work = models.Work.objects.create(title="Example Work") + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) self.readthrough = models.ReadThrough.objects.create( user=self.user, book=self.edition diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index 0a630dd1..d629b5c7 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -10,22 +10,21 @@ class Relationship(TestCase): def setUp(self): """we need some users for this""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "http://local.com/user/mouse" - self.local_user.save(broadcast=False) + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.local_user.remote_id = "http://local.com/user/mouse" + self.local_user.save(broadcast=False) def test_user_follows_from_request(self): """convert a follow request into a follow""" diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index f5c255a6..911df059 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -12,15 +12,11 @@ class Shelf(TestCase): def setUp(self): """look, a shelf""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="test book", parent_work=work - ) + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create(title="test book", parent_work=work) def test_remote_id(self): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index f8d49abc..355caab9 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -22,31 +22,29 @@ class Status(TestCase): def setUp(self): """useful things for creating a status""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="Test Edition") + self.book = models.Edition.objects.create(title="Test Edition") - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - with patch("bookwyrm.models.Status.broadcast"): - image.save(output, format=image.format) - self.book.cover.save("test.jpg", ContentFile(output.getvalue())) + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + with patch("bookwyrm.models.Status.broadcast"): + image.save(output, format=image.format) + self.book.cover.save("test.jpg", ContentFile(output.getvalue())) def test_status_generated_fields(self, *_): """setting remote id""" @@ -61,10 +59,9 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -96,10 +93,9 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -256,15 +252,14 @@ class Status(TestCase): def test_review_to_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create( - name="Review name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity() + status = models.Review.objects.create( + name="Review name", + content="test content", + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity() self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Review") self.assertEqual(activity["rating"], 3) @@ -274,15 +269,14 @@ class Status(TestCase): def test_review_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create( - name="Review's name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + status = models.Review.objects.create( + name="Review's name", + content="test content", + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Article") self.assertEqual( @@ -299,14 +293,13 @@ class Status(TestCase): def test_review_to_pure_activity_no_rating(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create( - name="Review name", - content="test content", - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + status = models.Review.objects.create( + name="Review name", + content="test content", + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Article") self.assertEqual( @@ -322,13 +315,12 @@ class Status(TestCase): def test_reviewrating_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.ReviewRating.objects.create( - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + status = models.ReviewRating.objects.create( + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Note") self.assertEqual( @@ -357,12 +349,11 @@ class Status(TestCase): status = models.Status.objects.create( content="test content", user=self.local_user ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - fav = models.Favorite.objects.create(status=status, user=self.local_user) + fav = models.Favorite.objects.create(status=status, user=self.local_user) - # can't fav a status twice - with self.assertRaises(IntegrityError): - models.Favorite.objects.create(status=status, user=self.local_user) + # can't fav a status twice + with self.assertRaises(IntegrityError): + models.Favorite.objects.create(status=status, user=self.local_user) activity = fav.to_activity() self.assertEqual(activity["type"], "Like") diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index b6c71663..b2791379 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -11,16 +11,15 @@ from bookwyrm.settings import DOMAIN # pylint: disable=missing-function-docstring class User(TestCase): def setUp(self): - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "mouse@%s" % DOMAIN, - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", - name="hi", - bookwyrm_user=False, - ) + self.user = models.User.objects.create_user( + "mouse@%s" % DOMAIN, + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + name="hi", + bookwyrm_user=False, + ) def test_computed_fields(self): """username instead of id here""" @@ -35,16 +34,15 @@ class User(TestCase): self.assertIsNotNone(self.user.key_pair.public_key) def test_remote_user(self): - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = models.User.objects.create_user( - "rat", - "rat@rat.rat", - "ratword", - local=False, - remote_id="https://example.com/dfjkg", - bookwyrm_user=False, - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + local=False, + remote_id="https://example.com/dfjkg", + bookwyrm_user=False, + ) self.assertEqual(user.username, "rat@example.com") def test_user_shelves(self): diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py index da335e89..0dd8ffe3 100644 --- a/bookwyrm/tests/test_activitystreams.py +++ b/bookwyrm/tests/test_activitystreams.py @@ -11,29 +11,27 @@ class Activitystreams(TestCase): def setUp(self): """use a test csv""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + self.another_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.another_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.nutria", - "password", - local=True, - localname="nutria", - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test book") + self.book = models.Edition.objects.create(title="test book") class TestStream(activitystreams.ActivityStream): """test stream, don't have to do anything here""" diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index e7b1bb1c..4f8b16eb 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -3,7 +3,6 @@ from unittest.mock import patch from django.test import TestCase from django.test.client import RequestFactory -import responses from bookwyrm import emailing, models @@ -15,16 +14,14 @@ class Emailing(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.SiteSettings.objects.create() def test_invite_email(self, email_mock): """load the invite email""" diff --git a/bookwyrm/tests/test_postgres.py b/bookwyrm/tests/test_postgres.py index 98385d34..70775d47 100644 --- a/bookwyrm/tests/test_postgres.py +++ b/bookwyrm/tests/test_postgres.py @@ -6,17 +6,16 @@ from bookwyrm import models @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") -@patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay") class PostgresTriggers(TestCase): """special migrations, fancy stuff ya know""" - def test_search_vector_on_create(self, *_): + def test_search_vector_on_create(self, _): """make sure that search_vector is being set correctly on create""" book = models.Edition.objects.create(title="The Long Goodbye") book.refresh_from_db() self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") - def test_search_vector_on_update(self, *_): + def test_search_vector_on_update(self, _): """make sure that search_vector is being set correctly on edit""" book = models.Edition.objects.create(title="The Long Goodbye") book.title = "The Even Longer Goodbye" @@ -24,7 +23,7 @@ class PostgresTriggers(TestCase): book.refresh_from_db() self.assertEqual(book.search_vector, "'even':2A 'goodby':4A 'longer':3A") - def test_search_vector_fields(self, *_): + def test_search_vector_fields(self, _): """use multiple fields to create search vector""" author = models.Author.objects.create(name="The Rays") book = models.Edition.objects.create( @@ -40,7 +39,7 @@ class PostgresTriggers(TestCase): "'cool':5B 'goodby':3A 'long':2A 'name':9 'rays':7C 'seri':8 'the':6C 'wow':4B", ) - def test_seach_vector_on_author_update(self, *_): + def test_seach_vector_on_author_update(self, _): """update search when an author name changes""" author = models.Author.objects.create(name="The Rays") book = models.Edition.objects.create( @@ -53,7 +52,7 @@ class PostgresTriggers(TestCase): self.assertEqual(book.search_vector, "'goodby':3A 'jeremy':4C 'long':2A") - def test_seach_vector_on_author_delete(self, *_): + def test_seach_vector_on_author_delete(self, _): """update search when an author name changes""" author = models.Author.objects.create(name="Jeremy") book = models.Edition.objects.create( @@ -68,7 +67,7 @@ class PostgresTriggers(TestCase): book.refresh_from_db() self.assertEqual(book.search_vector, "'goodby':3A 'long':2A") - def test_search_vector_stop_word_fallback(self, *_): + def test_search_vector_stop_word_fallback(self, _): """use a fallback when removing stop words leads to an empty vector""" book = models.Edition.objects.create( title="there there", diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index ac9e3f1c..04e4c591 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -1,6 +1,5 @@ """ test generating preview images """ import pathlib -from unittest.mock import patch from PIL import Image from django.test import TestCase @@ -27,31 +26,32 @@ class PreviewImages(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - avatar_file = pathlib.Path(__file__).parent.joinpath( - "../static/images/no_cover.jpg" - ) - self.local_user = models.User.objects.create_user( - "possum@local.com", - "possum@possum.possum", - "password", - local=True, - localname="possum", - avatar=SimpleUploadedFile( - avatar_file, - open(avatar_file, "rb").read(), - content_type="image/jpeg", - ), - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.edition = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.site = models.SiteSettings.objects.create() + avatar_file = pathlib.Path(__file__).parent.joinpath( + "../static/images/no_cover.jpg" + ) + self.local_user = models.User.objects.create_user( + "possum@local.com", + "possum@possum.possum", + "password", + local=True, + localname="possum", + avatar=SimpleUploadedFile( + avatar_file, + open(avatar_file, "rb").read(), + content_type="image/jpeg", + ), + ) + + self.work = models.Work.objects.create(title="Test Work") + self.edition = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + + self.site = models.SiteSettings.objects.create() + + settings.ENABLE_PREVIEW_IMAGES = True def test_generate_preview_image(self, *args, **kwargs): image_file = pathlib.Path(__file__).parent.joinpath( diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index b9b1af26..01b25904 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -37,20 +37,19 @@ class Signature(TestCase): def setUp(self): """create users and test data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.mouse = models.User.objects.create_user( - "mouse@%s" % DOMAIN, - "mouse@example.com", - "", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat" - ) - self.cat = models.User.objects.create_user( - "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat" - ) + self.mouse = models.User.objects.create_user( + "mouse@%s" % DOMAIN, + "mouse@example.com", + "", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat" + ) + self.cat = models.User.objects.create_user( + "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat" + ) private_key, public_key = create_key_pair() @@ -58,8 +57,7 @@ class Signature(TestCase): "http://localhost/user/remote", KeyPair(private_key, public_key) ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def send(self, signature, now, data, digest): """test request""" @@ -119,10 +117,9 @@ class Signature(TestCase): status=200, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.get_remote_reviews.delay"): - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + with patch("bookwyrm.models.user.get_remote_reviews.delay"): + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) @responses.activate def test_key_needs_refresh(self): @@ -143,23 +140,22 @@ class Signature(TestCase): data["publicKey"]["publicKeyPem"] = key_pair.public_key responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.get_remote_reviews.delay"): - # Key correct: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + with patch("bookwyrm.models.user.get_remote_reviews.delay"): + # Key correct: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Old key is cached, so still works: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + # Old key is cached, so still works: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Try with new key: - response = self.send_test_request(sender=new_sender) - self.assertEqual(response.status_code, 200) + # Try with new key: + response = self.send_test_request(sender=new_sender) + self.assertEqual(response.status_code, 200) - # Now the old key will fail: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 401) + # Now the old key will fail: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 401) @responses.activate def test_nonexistent_signer(self): diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index 2e10d930..8e16c9d3 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -22,30 +22,27 @@ class TemplateTags(TestCase): def setUp(self): """create some filler objects""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", + self.user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + remote_id="http://example.com/rat", + local=False, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.rat", - "ratword", - remote_id="http://example.com/rat", - local=False, - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="Test Book") + self.book = models.Edition.objects.create(title="Test Book") def test_get_user_rating(self, *_): """get a user's most recent rating of a book""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.Review.objects.create(user=self.user, book=self.book, rating=3) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.Review.objects.create(user=self.user, book=self.book, rating=3) self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3) def test_get_user_rating_doesnt_exist(self, *_): @@ -63,30 +60,27 @@ class TemplateTags(TestCase): utilities.get_user_identifier(self.remote_user), "rat@example.com" ) + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") def test_get_replies(self, *_): """direct replies to a status""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) - first_child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) + first_child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + second_child = models.Status.objects.create( + reply_parent=parent, user=self.user, content="hi" + ) + with patch( + "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" + ): + third_child = models.Status.objects.create( + reply_parent=parent, + user=self.user, + deleted=True, + deleted_date=timezone.now(), ) - second_child = models.Status.objects.create( - reply_parent=parent, user=self.user, content="hi" - ) - with patch( - "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" - ): - third_child = models.Status.objects.create( - reply_parent=parent, - user=self.user, - deleted=True, - deleted_date=timezone.now(), - ) replies = status_display.get_replies(parent) self.assertEqual(len(replies), 2) @@ -97,12 +91,9 @@ class TemplateTags(TestCase): def test_get_parent(self, *_): """get the reply parent of a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) child = models.Status.objects.create( reply_parent=parent, user=self.user, content="hi" ) @@ -113,8 +104,7 @@ class TemplateTags(TestCase): def test_get_user_liked(self, *_): """did a user like a status""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_liked(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -123,8 +113,7 @@ class TemplateTags(TestCase): def test_get_user_boosted(self, *_): """did a user boost a status""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_boosted(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -133,34 +122,28 @@ class TemplateTags(TestCase): def test_get_boosted(self, *_): """load a boosted status""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - status = models.Review.objects.create( - user=self.remote_user, book=self.book - ) - boost = models.Boost.objects.create( - user=self.user, boosted_status=status - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + status = models.Review.objects.create(user=self.remote_user, book=self.book) + boost = models.Boost.objects.create(user=self.user, boosted_status=status) boosted = status_display.get_boosted(boost) self.assertIsInstance(boosted, models.Review) self.assertEqual(boosted, status) def test_get_book_description(self, *_): """grab it from the edition or the parent""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book.parent_work = work - self.book.save() + work = models.Work.objects.create(title="Test Work") + self.book.parent_work = work + self.book.save() - self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) + self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) - work.description = "hi" - work.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") + work.description = "hi" + work.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") - self.book.description = "hello" - self.book.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") + self.book.description = "hello" + self.book.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") def test_get_uuid(self, *_): """uuid functionality""" diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index 0ac813bb..43032c62 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -19,26 +19,25 @@ class Inbox(TestCase): self.client = Client() self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + local_user.remote_id = "https://example.com/user/mouse" + 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", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) self.create_json = { "id": "hi", "type": "Create", @@ -47,8 +46,7 @@ class Inbox(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_inbox_invalid_get(self): """shouldn't try to handle if the user is not found""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 2862fdf5..64be49b8 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -13,35 +13,34 @@ class InboxAdd(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + local_user.remote_id = "https://example.com/user/mouse" + 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", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://example.com/book/37292", - parent_work=work, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://example.com/book/37292", + parent_work=work, + ) + + models.SiteSettings.objects.create() @responses.activate def test_handle_add_book_to_shelf(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 43900e33..5866ed1f 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -13,34 +13,33 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", + + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + self.status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.status = models.Status.objects.create( - user=self.local_user, - content="Test status", - remote_id="https://example.com/status/1", - ) self.create_json = { "id": "hi", @@ -50,8 +49,8 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() @patch("bookwyrm.activitystreams.ActivityStream.add_status") @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") @@ -88,13 +87,12 @@ class InboxActivities(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores") def test_boost_remote_status(self, redis_mock, _): """boost a status from a remote server""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="work title") - book = models.Edition.objects.create( - title="Test", - remote_id="https://bookwyrm.social/book/37292", - parent_work=work, - ) + work = models.Work.objects.create(title="work title") + book = models.Edition.objects.create( + title="Test", + remote_id="https://bookwyrm.social/book/37292", + parent_work=work, + ) self.assertEqual(models.Notification.objects.count(), 0) activity = { "type": "Announce", diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 8c12e42b..956cf538 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -12,28 +12,27 @@ class InboxBlock(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_handle_blocks(self): """create a "block" database entry from an activity""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index ed5e6f93..d2fdb8b6 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -10,38 +10,31 @@ from bookwyrm.activitypub import ActivitySerializerError # pylint: disable=too-many-public-methods +@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") class InboxCreate(TestCase): """readthrough tests""" def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.status = models.Status.objects.create( - user=self.local_user, - content="Test status", - remote_id="https://example.com/status/1", - ) self.create_json = { "id": "hi", @@ -51,22 +44,18 @@ class InboxCreate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() - def test_create_status(self): + def test_create_status(self, _): """the "it justs works" mode""" - self.assertEqual(models.Status.objects.count(), 1) - datafile = pathlib.Path(__file__).parent.joinpath( "../../data/ap_quotation.json" ) status_data = json.loads(datafile.read_bytes()) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = status_data @@ -81,15 +70,13 @@ class InboxCreate(TestCase): self.assertEqual(status.quote, "quote body") self.assertEqual(status.content, "commentary") self.assertEqual(status.user, self.local_user) - self.assertEqual(models.Status.objects.count(), 2) # while we're here, lets ensure we avoid dupes views.inbox.activity_task(activity) - self.assertEqual(models.Status.objects.count(), 2) - - def test_create_status_remote_note_with_mention(self): - """should only create it under the right circumstances""" self.assertEqual(models.Status.objects.count(), 1) + + def test_create_status_remote_note_with_mention(self, _): + """should only create it under the right circumstances""" self.assertFalse( models.Notification.objects.filter(user=self.local_user).exists() ) @@ -110,15 +97,22 @@ class InboxCreate(TestCase): ) self.assertEqual(models.Notification.objects.get().notification_type, "MENTION") - def test_create_status_remote_note_with_reply(self): + def test_create_status_remote_note_with_reply(self, _): """should only create it under the right circumstances""" + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + parent_status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", + ) + self.assertEqual(models.Status.objects.count(), 1) self.assertFalse(models.Notification.objects.filter(user=self.local_user)) datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json") status_data = json.loads(datafile.read_bytes()) del status_data["tag"] - status_data["inReplyTo"] = self.status.remote_id + status_data["inReplyTo"] = parent_status.remote_id activity = self.create_json activity["object"] = status_data @@ -127,16 +121,15 @@ class InboxCreate(TestCase): self.assertTrue(redis_mock.called) status = models.Status.objects.last() self.assertEqual(status.content, "test content in note") - self.assertEqual(status.reply_parent, self.status) + self.assertEqual(status.reply_parent, parent_status) self.assertTrue(models.Notification.objects.filter(user=self.local_user)) self.assertEqual(models.Notification.objects.get().notification_type, "REPLY") - def test_create_rating(self): + def test_create_rating(self, _): """a remote rating activity""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + book = models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = { "id": "https://example.com/user/mouse/reviewrating/12", @@ -149,8 +142,8 @@ class InboxCreate(TestCase): "id": "https://example.com/user/mouse/reviewrating/12/replies", "type": "OrderedCollection", "totalItems": 0, - "first": "https://example.com/user/mouse/reviewrating/12/replies?page=1", - "last": "https://example.com/user/mouse/reviewrating/12/replies?page=1", + "first": "https://example.com/u/mouse/reviewrating/12/replies?page=1", + "last": "https://example.com/u/mouse/reviewrating/12/replies?page=1", "@context": "https://www.w3.org/ns/activitystreams", }, "inReplyTo": "", @@ -162,17 +155,14 @@ class InboxCreate(TestCase): "rating": 3, "@context": "https://www.w3.org/ns/activitystreams", } - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch( - "bookwyrm.activitystreams.ActivityStream.add_status" - ) as redis_mock: - views.inbox.activity_task(activity) - self.assertTrue(redis_mock.called) + with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: + views.inbox.activity_task(activity) + self.assertTrue(redis_mock.called) rating = models.ReviewRating.objects.first() self.assertEqual(rating.book, book) self.assertEqual(rating.rating, 3.0) - def test_create_list(self): + def test_create_list(self, _): """a new list""" activity = self.create_json activity["object"] = { @@ -196,7 +186,7 @@ class InboxCreate(TestCase): self.assertEqual(book_list.description, "summary text") self.assertEqual(book_list.remote_id, "https://example.com/list/22") - def test_create_unsupported_type(self): + def test_create_unsupported_type(self, _): """ignore activities we know we can't handle""" activity = self.create_json activity["object"] = { @@ -206,7 +196,7 @@ class InboxCreate(TestCase): # just observer how it doesn't throw an error views.inbox.activity_task(activity) - def test_create_unknown_type(self): + def test_create_unknown_type(self, _): """ignore activities we know we've never heard of""" activity = self.create_json activity["object"] = { diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 067a30ad..617dcf6f 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -13,26 +13,25 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( user=self.remote_user, @@ -48,8 +47,7 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_delete_status(self): """remove a status""" @@ -119,8 +117,7 @@ class InboxActivities(TestCase): "object": self.remote_user.remote_id, } - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - views.inbox.activity_task(activity) + views.inbox.activity_task(activity) self.assertFalse(models.User.objects.get(username="rat@example.com").is_active) def test_delete_user_unknown(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 063ad5d3..f5332b7a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -13,29 +13,27 @@ class InboxRelationships(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_follow(self): """remote user wants to follow local user""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 5d072fb0..433d5ba4 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -12,26 +12,25 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): @@ -50,8 +49,7 @@ class InboxActivities(TestCase): "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_handle_favorite(self): """fav a status""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index 2812ef1f..4e78480a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -12,37 +12,34 @@ class InboxRemove(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "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(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://bookwyrm.social/book/37292", - parent_work=self.work, + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://bookwyrm.social/book/37292", + parent_work=self.work, + ) + + models.SiteSettings.objects.create() def test_handle_unshelve_book(self): """remove a book from a shelf""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index db9b0ca0..242cfe91 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -14,26 +14,25 @@ class InboxUpdate(TestCase): def setUp(self): """basic user and book data""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "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(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - self.local_user.remote_id = "https://example.com/user/mouse" - 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", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) self.create_json = { "id": "hi", @@ -43,8 +42,8 @@ class InboxUpdate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_update_list(self): """a new list""" @@ -99,17 +98,16 @@ class InboxUpdate(TestCase): self.assertIsNone(self.remote_user.name) self.assertFalse(self.remote_user.discoverable) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - views.inbox.activity_task( - { - "type": "Update", - "to": [], - "cc": [], - "actor": "hi", - "id": "sdkjf", - "object": userdata, - } - ) + views.inbox.activity_task( + { + "type": "Update", + "to": [], + "cc": [], + "actor": "hi", + "id": "sdkjf", + "object": userdata, + } + ) user = models.User.objects.get(id=self.remote_user.id) self.assertEqual(user.name, "RAT???") self.assertEqual(user.username, "rat@example.com") @@ -124,28 +122,27 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json") bookdata = json.loads(datafile.read_bytes()) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - models.Work.objects.create( - title="Test Work", remote_id="https://bookwyrm.social/book/5988" - ) - book = models.Edition.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5989" - ) + models.Work.objects.create( + title="Test Work", remote_id="https://bookwyrm.social/book/5988" + ) + book = models.Edition.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5989" + ) - del bookdata["authors"] - self.assertEqual(book.title, "Test Book") + del bookdata["authors"] + self.assertEqual(book.title, "Test Book") - with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): - views.inbox.activity_task( - { - "type": "Update", - "to": [], - "cc": [], - "actor": "hi", - "id": "sdkjf", - "object": bookdata, - } - ) + with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): + views.inbox.activity_task( + { + "type": "Update", + "to": [], + "cc": [], + "actor": "hi", + "id": "sdkjf", + "object": bookdata, + } + ) book = models.Edition.objects.get(id=book.id) self.assertEqual(book.title, "Piranesi") self.assertEqual(book.last_edited_by, self.remote_user) @@ -155,10 +152,9 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json") bookdata = json.loads(datafile.read_bytes()) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - book = models.Work.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5988" - ) + book = models.Work.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5988" + ) del bookdata["authors"] self.assertEqual(book.title, "Test Book") diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py index e2592394..8df6302c 100644 --- a/bookwyrm/tests/views/test_announcements.py +++ b/bookwyrm/tests/views/test_announcements.py @@ -2,7 +2,6 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory -from unittest.mock import patch from bookwyrm import forms, models, views @@ -13,16 +12,15 @@ class AnnouncementViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + + models.SiteSettings.objects.create() def test_announcements_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py index 94213c61..22f3c20f 100644 --- a/bookwyrm/tests/views/test_authentication.py +++ b/bookwyrm/tests/views/test_authentication.py @@ -19,18 +19,17 @@ class AuthenticationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "password", - local=True, - localname="mouse", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.settings = models.SiteSettings.objects.create(id=1) + + self.settings = models.SiteSettings.objects.create(id=1) def test_login_get(self): """there are so many views, this just makes sure it LOADS""" @@ -60,9 +59,8 @@ class AuthenticationViews(TestCase): "email": "aa@bb.cccc", }, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) nutria = models.User.objects.last() @@ -77,9 +75,8 @@ class AuthenticationViews(TestCase): "register/", {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"}, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) nutria = models.User.objects.last() @@ -157,9 +154,8 @@ class AuthenticationViews(TestCase): "invite_code": "testcode", }, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) self.assertEqual(models.SiteInvite.objects.get().times_used, 1) diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 06080bb2..0169bbe8 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -17,15 +17,14 @@ class AuthorViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -34,15 +33,14 @@ class AuthorViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + + models.SiteSettings.objects.create() def test_author_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index d640617c..c6fc9eb8 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -14,26 +14,25 @@ class BlockViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_block_get(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 375cdb03..73f2cad1 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -23,15 +23,14 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -40,15 +39,14 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + + models.SiteSettings.objects.create() def test_book_page(self): """there are so many views, this just makes sure it LOADS""" @@ -74,8 +72,7 @@ class BookViews(TestCase): request = self.factory.get("") request.user = self.local_user request.user.is_superuser = True - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - result = view(request, self.book.id) + result = view(request, self.book.id) self.assertIsInstance(result, TemplateResponse) result.render() self.assertEqual(result.status_code, 200) @@ -90,9 +87,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") @@ -108,9 +104,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - result = view(request, self.book.id) - result.render() + result = view(request, self.book.id) + result.render() # the changes haven't been saved yet self.book.refresh_from_db() @@ -128,9 +123,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") @@ -150,9 +144,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") self.assertFalse(self.book.authors.exists()) @@ -167,8 +160,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - view(request) + view(request) + book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") @@ -183,8 +176,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - view(request) + view(request) + book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work, self.work) @@ -200,8 +193,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - view(request) + view(request) + book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") self.assertEqual(book.authors.first().name, "Sappho") @@ -210,11 +203,8 @@ class BookViews(TestCase): def test_switch_edition(self): """updates user's relationships to a book""" work = models.Work.objects.create(title="test work") - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - edition1 = models.Edition.objects.create(title="first ed", parent_work=work) - edition2 = models.Edition.objects.create( - title="second ed", parent_work=work - ) + edition1 = models.Edition.objects.create(title="first ed", parent_work=work) + edition2 = models.Edition.objects.create(title="second ed", parent_work=work) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user) models.ShelfBook.objects.create( @@ -267,12 +257,11 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - views.upload_cover(request, self.book.id) - self.assertEqual(delay_mock.call_count, 1) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + views.upload_cover(request, self.book.id) + self.assertEqual(delay_mock.call_count, 1) self.book.refresh_from_db() self.assertTrue(self.book.cover) @@ -300,12 +289,11 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - views.upload_cover(request, self.book.id) - self.assertEqual(delay_mock.call_count, 1) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + views.upload_cover(request, self.book.id) + self.assertEqual(delay_mock.call_count, 1) self.book.refresh_from_db() self.assertTrue(self.book.cover) diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index 79dbd2a2..c2026cca 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -2,7 +2,6 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory -from unittest.mock import patch from bookwyrm import models, views @@ -13,26 +12,25 @@ class DirectoryViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - discoverable=True, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + discoverable=True, + ) + + models.SiteSettings.objects.create() def test_directory_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py index af39f005..7c0825b1 100644 --- a/bookwyrm/tests/views/test_edit_user.py +++ b/bookwyrm/tests/views/test_edit_user.py @@ -21,29 +21,26 @@ class EditUserViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) + + self.book = models.Edition.objects.create(title="test") + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.first(), ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test") - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.first(), - ) - - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False @@ -68,12 +65,11 @@ class EditUserViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") @@ -93,12 +89,11 @@ class EditUserViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") self.assertIsNotNone(self.local_user.avatar) diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index 9ff12255..6db65b78 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -15,26 +15,25 @@ class FederationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_federation_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 81087cd1..a6a3d967 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -22,22 +22,19 @@ class FeedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) + models.SiteSettings.objects.create() def test_feed(self, *_): """there are so many views, this just makes sure it LOADS""" @@ -92,14 +89,11 @@ class FeedViews(TestCase): output = BytesIO() image.save(output, format=image.format) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - status = models.Review.objects.create( - content="hi", - user=self.local_user, - book=self.book, - ) + status = models.Review.objects.create( + content="hi", + user=self.local_user, + book=self.book, + ) attachment = models.Image.objects.create( status=status, caption="alt text here" ) @@ -152,13 +146,12 @@ class FeedViews(TestCase): def test_get_suggested_book(self, *_): """gets books the ~*~ algorithm ~*~ thinks you want to post about""" - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.get(identifier="reading"), - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.get(identifier="reading"), + ) suggestions = views.feed.get_suggested_books(self.local_user) self.assertEqual(suggestions[0]["name"], "Currently Reading") self.assertEqual(suggestions[0]["books"][0], self.book) diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index f37370cc..45e60d3c 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -16,25 +16,24 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -43,13 +42,12 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) def test_handle_follow_remote(self): """send a follow request""" @@ -68,16 +66,15 @@ class BookViews(TestCase): def test_handle_follow_local_manually_approves(self): """send a follow request""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - manually_approves_followers=True, - ) + rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + manually_approves_followers=True, + ) request = self.factory.post("", {"user": rat}) request.user = self.local_user self.assertEqual(models.UserFollowRequest.objects.count(), 0) @@ -92,15 +89,14 @@ class BookViews(TestCase): def test_handle_follow_local(self): """send a follow request""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) + rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) request = self.factory.post("", {"user": rat}) request.user = self.local_user self.assertEqual(models.UserFollowRequest.objects.count(), 0) diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 7a3b0c44..1c55da08 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -13,25 +13,22 @@ class GetStartedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_profile_view(self): """there are so many views, this just makes sure it LOADS""" @@ -55,12 +52,11 @@ class GetStartedViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertTrue(self.local_user.discoverable) diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index 013d1595..4e8f6ee2 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -16,32 +16,29 @@ class GoalViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_goal_page_no_goal(self): """view a reading goal page for another's unset goal""" diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index e8d1895c..874b913e 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -19,34 +19,32 @@ class ViewsHelpers(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + discoverable=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", discoverable=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - discoverable=True, - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") self.userdata = json.loads(datafile.read_bytes()) del self.userdata["icon"] @@ -144,11 +142,10 @@ class ViewsHelpers(TestCase): json=self.userdata, status=200, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = views.helpers.handle_remote_webfinger("@mouse@example.com") - self.assertIsInstance(result, models.User) - self.assertEqual(result.username, "mouse@example.com") + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = views.helpers.handle_remote_webfinger("@mouse@example.com") + self.assertIsInstance(result, models.User) + self.assertEqual(result.username, "mouse@example.com") def test_user_on_blocked_server(self, _): """find a remote user using webfinger""" @@ -205,22 +202,21 @@ class ViewsHelpers(TestCase): def test_get_annotated_users(self, _): """list of people you might know""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", - local=True, - localname="nutria", - discoverable=True, - ) - user_2 = models.User.objects.create_user( - "fish@local.com", - "fish@fish.com", - "fishword", - local=True, - localname="fish", - ) + user_1 = models.User.objects.create_user( + "nutria@local.com", + "nutria@nutria.com", + "nutriaword", + local=True, + localname="nutria", + discoverable=True, + ) + user_2 = models.User.objects.create_user( + "fish@local.com", + "fish@fish.com", + "fishword", + local=True, + localname="fish", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): # 1 shared follow self.local_user.following.add(user_2) @@ -253,42 +249,39 @@ class ViewsHelpers(TestCase): def test_get_annotated_users_counts(self, _): """correct counting for multiple shared attributed""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", + user_1 = models.User.objects.create_user( + "nutria@local.com", + "nutria@nutria.com", + "nutriaword", + local=True, + localname="nutria", + discoverable=True, + ) + for i in range(3): + user = models.User.objects.create_user( + "{:d}@local.com".format(i), + "{:d}@nutria.com".format(i), + "password", local=True, - localname="nutria", - discoverable=True, + localname=i, ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - for i in range(3): - user = models.User.objects.create_user( - "{:d}@local.com".format(i), - "{:d}@nutria.com".format(i), - "password", - local=True, - localname=i, - ) - user.following.add(user_1) - user.followers.add(self.local_user) + user.following.add(user_1) + user.followers.add(self.local_user) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - for i in range(3): - book = models.Edition.objects.create( - title=i, - parent_work=models.Work.objects.create(title=i), - ) - models.ShelfBook.objects.create( - user=self.local_user, - book=book, - shelf=self.local_user.shelf_set.first(), - ) - models.ShelfBook.objects.create( - user=user_1, book=book, shelf=user_1.shelf_set.first() - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + for i in range(3): + book = models.Edition.objects.create( + title=i, + parent_work=models.Work.objects.create(title=i), + ) + models.ShelfBook.objects.create( + user=self.local_user, + book=book, + shelf=self.local_user.shelf_set.first(), + ) + models.ShelfBook.objects.create( + user=user_1, book=book, shelf=user_1.shelf_set.first() + ) result = views.helpers.get_annotated_users( self.local_user, diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py index da8ade98..22694623 100644 --- a/bookwyrm/tests/views/test_import.py +++ b/bookwyrm/tests/views/test_import.py @@ -14,16 +14,14 @@ class ImportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.SiteSettings.objects.create() def test_import_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 1661676c..3867f57d 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -15,33 +15,31 @@ class InteractionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_favorite(self, *_): """create and broadcast faving a status""" diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py index 0743c65e..7b5071b3 100644 --- a/bookwyrm/tests/views/test_invite.py +++ b/bookwyrm/tests/views/test_invite.py @@ -16,16 +16,14 @@ class InviteViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.SiteSettings.objects.create() def test_invite_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index f26a08e5..2aedd3ce 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -16,28 +16,25 @@ class IsbnViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - isbn_13="1234567890123", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + isbn_13="1234567890123", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_isbn_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py index 7def3958..864e48f7 100644 --- a/bookwyrm/tests/views/test_landing.py +++ b/bookwyrm/tests/views/test_landing.py @@ -15,18 +15,16 @@ class LandingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_home_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index 3783b9b6..399892e3 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -17,48 +17,46 @@ class ListViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - work_two = models.Work.objects.create(title="Labori") - self.book_two = models.Edition.objects.create( - title="Example Edition 2", - remote_id="https://example.com/book/2", - parent_work=work_two, - ) - work_three = models.Work.objects.create(title="Trabajar") - self.book_three = models.Edition.objects.create( - title="Example Edition 3", - remote_id="https://example.com/book/3", - parent_work=work_three, - ) - work_four = models.Work.objects.create(title="Travailler") - self.book_four = models.Edition.objects.create( - title="Example Edition 4", - remote_id="https://example.com/book/4", - parent_work=work_four, - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) + work = models.Work.objects.create(title="Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + work_two = models.Work.objects.create(title="Labori") + self.book_two = models.Edition.objects.create( + title="Example Edition 2", + remote_id="https://example.com/book/2", + parent_work=work_two, + ) + work_three = models.Work.objects.create(title="Trabajar") + self.book_three = models.Edition.objects.create( + title="Example Edition 3", + remote_id="https://example.com/book/3", + parent_work=work_three, + ) + work_four = models.Work.objects.create(title="Travailler") + self.book_four = models.Edition.objects.create( + title="Example Edition 4", + remote_id="https://example.com/book/4", + parent_work=work_four, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.list = models.List.objects.create( @@ -66,8 +64,8 @@ class ListViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + + models.SiteSettings.objects.create() def test_lists_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py index cbe00d27..a5986782 100644 --- a/bookwyrm/tests/views/test_list_actions.py +++ b/bookwyrm/tests/views/test_list_actions.py @@ -15,49 +15,47 @@ class ListActionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - work_two = models.Work.objects.create(title="Labori") - self.book_two = models.Edition.objects.create( - title="Example Edition 2", - remote_id="https://example.com/book/2", - parent_work=work_two, - ) - work_three = models.Work.objects.create(title="Trabajar") - self.book_three = models.Edition.objects.create( - title="Example Edition 3", - remote_id="https://example.com/book/3", - parent_work=work_three, - ) - work_four = models.Work.objects.create(title="Travailler") - self.book_four = models.Edition.objects.create( - title="Example Edition 4", - remote_id="https://example.com/book/4", - parent_work=work_four, - ) + work = models.Work.objects.create(title="Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + work_two = models.Work.objects.create(title="Labori") + self.book_two = models.Edition.objects.create( + title="Example Edition 2", + remote_id="https://example.com/book/2", + parent_work=work_two, + ) + work_three = models.Work.objects.create(title="Trabajar") + self.book_three = models.Edition.objects.create( + title="Example Edition 3", + remote_id="https://example.com/book/3", + parent_work=work_three, + ) + work_four = models.Work.objects.create(title="Travailler") + self.book_four = models.Edition.objects.create( + title="Example Edition 4", + remote_id="https://example.com/book/4", + parent_work=work_four, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.list = models.List.objects.create( @@ -65,8 +63,7 @@ class ListActionViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_curate_approve(self): """approve a pending item""" diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 1de196c5..182753f9 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -2,7 +2,6 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory -from unittest.mock import patch from bookwyrm import models from bookwyrm import views @@ -14,16 +13,14 @@ class NotificationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.SiteSettings.objects.create() def test_notifications_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index 8877a244..f89258e5 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -18,22 +18,20 @@ class OutboxView(TestCase): def setUp(self): """we'll need some data""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_outbox(self, _): """returns user's statuses""" @@ -81,16 +79,13 @@ class OutboxView(TestCase): def test_outbox_filter(self, _): """if we only care about reviews, only get reviews""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - models.Review.objects.create( - content="look at this", - name="hi", - rating=1, - book=self.book, - user=self.local_user, - ) + models.Review.objects.create( + content="look at this", + name="hi", + rating=1, + book=self.book, + user=self.local_user, + ) models.Status.objects.create(content="look at this", user=self.local_user) request = self.factory.get("", {"type": "bleh"}) @@ -110,16 +105,13 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_true(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + models.Review.objects.create( + name="hi", + content="look at this", + user=self.local_user, + book=self.book, + privacy="public", + ) request = self.factory.get("", {"page": 1}, HTTP_USER_AGENT=USER_AGENT) result = views.Outbox.as_view()(request, "mouse") @@ -131,16 +123,13 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_false(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + models.Review.objects.create( + name="hi", + content="look at this", + user=self.local_user, + book=self.book, + privacy="public", + ) request = self.factory.get("", {"page": 1}) result = views.Outbox.as_view()(request, "mouse") diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py index 982056b5..ec686db7 100644 --- a/bookwyrm/tests/views/test_password.py +++ b/bookwyrm/tests/views/test_password.py @@ -15,18 +15,16 @@ class PasswordViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "password", - local=True, - localname="mouse", - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create(id=1) + models.SiteSettings.objects.create(id=1) def test_password_reset_request(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index ec0d1339..00bd62c7 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -15,32 +15,30 @@ class ReadingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) def test_start_reading(self, _): """begin a book""" diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index ed479570..764490d8 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -15,17 +15,15 @@ class ReadThrough(TestCase): """basic user and book data""" self.client = Client() - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Example Work") + self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" - ) + self.user = models.User.objects.create_user( + "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.client.force_login(self.user) diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py index 7944d8b4..84539489 100644 --- a/bookwyrm/tests/views/test_reports.py +++ b/bookwyrm/tests/views/test_reports.py @@ -2,7 +2,6 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory -from unittest.mock import patch from bookwyrm import forms, models, views @@ -13,23 +12,21 @@ class ReportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@mouse.mouse", - "password", - local=True, - localname="rat", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@mouse.mouse", + "password", + local=True, + localname="rat", + ) + models.SiteSettings.objects.create() def test_reports_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 57961a31..eacb3c93 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -12,45 +12,39 @@ class RssFeedView(TestCase): def setUp(self): """test data""" - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - self.site = models.SiteSettings.objects.create() + self.site = models.SiteSettings.objects.create() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) + self.user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - with patch( - "bookwyrm.preview_images.generate_edition_preview_image_task.delay" - ): - self.review = models.Review.objects.create( - name="Review name", - content="test content", - rating=3, - user=self.user, - book=self.book, - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + self.review = models.Review.objects.create( + name="Review name", + content="test content", + rating=3, + user=self.user, + book=self.book, + ) - self.quote = models.Quotation.objects.create( - quote="a sickening sense", - content="test content", - user=self.user, - book=self.book, - ) + self.quote = models.Quotation.objects.create( + quote="a sickening sense", + content="test content", + user=self.user, + book=self.book, + ) - self.generatednote = models.GeneratedNote.objects.create( - content="test content", user=self.user - ) + self.generatednote = models.GeneratedNote.objects.create( + content="test content", user=self.user + ) self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 56413de6..ab2c910d 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -19,27 +19,24 @@ class Views(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_search_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py index 21a30544..239b3318 100644 --- a/bookwyrm/tests/views/test_shelf.py +++ b/bookwyrm/tests/views/test_shelf.py @@ -16,28 +16,25 @@ class ShelfViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=self.local_user ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() def test_shelf_page(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 68ddcd28..a20e98b9 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -16,35 +16,32 @@ class StatusViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + models.SiteSettings.objects.create() def test_handle_status(self, _): """create a status""" @@ -72,10 +69,9 @@ class StatusViews(TestCase): def test_handle_status_reply(self, _): """create a status in reply to an existing status""" view = views.CreateStatus.as_view() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True - ) + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True + ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): parent = models.Status.objects.create( content="parent status", user=self.local_user @@ -103,14 +99,13 @@ class StatusViews(TestCase): def test_handle_status_mentions(self, _): """@mention a user in a post""" view = views.CreateStatus.as_view() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "rat@%s" % DOMAIN, - "rat@rat.com", - "password", - local=True, - localname="rat", - ) + user = models.User.objects.create_user( + "rat@%s" % DOMAIN, + "rat@rat.com", + "password", + local=True, + localname="rat", + ) form = forms.CommentForm( { "content": "hi @rat", @@ -136,10 +131,9 @@ class StatusViews(TestCase): def test_handle_status_reply_with_mentions(self, _): """reply to a post with an @mention'ed user""" view = views.CreateStatus.as_view() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True, localname="rat" - ) + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True, localname="rat" + ) form = forms.CommentForm( { "content": "hi @rat@example.com", @@ -204,11 +198,10 @@ class StatusViews(TestCase): view = views.DeleteAndRedraft.as_view() request = self.factory.post("") request.user = self.local_user - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - status = models.ReviewRating.objects.create( - book=self.book, rating=2.0, user=self.local_user - ) + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + status = models.ReviewRating.objects.create( + book=self.book, rating=2.0, user=self.local_user + ) with patch( "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" @@ -242,14 +235,13 @@ class StatusViews(TestCase): def test_find_mentions(self, _): """detect and look up @ mentions of users""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - user = models.User.objects.create_user( - "nutria@%s" % DOMAIN, - "nutria@nutria.com", - "password", - local=True, - localname="nutria", - ) + user = models.User.objects.create_user( + "nutria@%s" % DOMAIN, + "nutria@nutria.com", + "password", + local=True, + localname="nutria", + ) self.assertEqual(user.username, "nutria@%s" % DOMAIN) self.assertEqual( diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index 07800e2f..fb003f8d 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -14,17 +14,15 @@ class UpdateViews(TestCase): def setUp(self): """we need basic test data and mocks""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.SiteSettings.objects.create() def test_get_notification_count(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 3e7a5108..478d2e8f 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -16,20 +16,18 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - self.book = models.Edition.objects.create(title="test") + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) + self.book = models.Edition.objects.create(title="test") with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): models.ShelfBook.objects.create( book=self.book, @@ -37,8 +35,7 @@ class UserViews(TestCase): shelf=self.local_user.shelf_set.first(), ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py index ac750be0..a044a22c 100644 --- a/bookwyrm/tests/views/test_user_admin.py +++ b/bookwyrm/tests/views/test_user_admin.py @@ -14,16 +14,14 @@ class UserAdminViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.SiteSettings.objects.create() def test_user_admin_list_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 839240ed..244921d4 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -15,30 +15,28 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + "rat", + "rat@remote.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - models.User.objects.create_user( - "rat", - "rat@remote.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False