Merge branch 'main' into group-privacy

bookwyrm/tests/views/shelf/__init__.py

@@ -0,0 +1 @@
+from . import *

bookwyrm/tests/views/shelf/test_shelf.py

@@ -0,0 +1,165 @@
+""" test for app action functionality """
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.activitypub import ActivitypubResponse
+from bookwyrm.tests.validate_html import validate_html
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.suggested_users.rerank_suggestions_task.delay")
+@patch("bookwyrm.activitystreams.populate_stream_task.delay")
+@patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
+@patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
+class ShelfViews(TestCase):
+    """tag views"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch(
+            "bookwyrm.activitystreams.populate_stream_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.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
+            )
+        models.SiteSettings.objects.create()
+
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+    def test_shelf_page_all_books(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_shelf_page_all_books_anonymous(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_shelf_page_sorted(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        shelf = self.local_user.shelf_set.first()
+        request = self.factory.get("", {"sort": "author"})
+        request.user = self.local_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username, shelf.identifier)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+    def test_shelf_page(self, *_):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Shelf.as_view()
+        shelf = self.local_user.shelf_set.first()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.local_user.username, shelf.identifier)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
+        self.assertEqual(result.status_code, 200)
+
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = True
+            result = view(request, self.local_user.username, shelf.identifier)
+        self.assertIsInstance(result, ActivitypubResponse)
+        self.assertEqual(result.status_code, 200)
+
+        request = self.factory.get("/?page=1")
+        request.user = self.local_user
+        with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api:
+            is_api.return_value = True
+            result = view(request, self.local_user.username, shelf.identifier)
+        self.assertIsInstance(result, ActivitypubResponse)
+        self.assertEqual(result.status_code, 200)
+
+    def test_edit_shelf_privacy(self, *_):
+        """set name or privacy on shelf"""
+        view = views.Shelf.as_view()
+        shelf = self.local_user.shelf_set.get(identifier="to-read")
+        self.assertEqual(shelf.privacy, "public")
+
+        request = self.factory.post(
+            "",
+            {
+                "privacy": "unlisted",
+                "user": self.local_user.id,
+                "name": "To Read",
+            },
+        )
+        request.user = self.local_user
+        view(request, self.local_user.username, shelf.identifier)
+        shelf.refresh_from_db()
+
+        self.assertEqual(shelf.privacy, "unlisted")
+
+    def test_edit_shelf_name(self, *_):
+        """change the name of an editable shelf"""
+        view = views.Shelf.as_view()
+        shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
+        self.assertEqual(shelf.privacy, "public")
+
+        request = self.factory.post(
+            "", {"privacy": "public", "user": self.local_user.id, "name": "cool name"}
+        )
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, request.user.username, shelf.identifier)
+        shelf.refresh_from_db()
+
+        self.assertEqual(shelf.name, "cool name")
+        self.assertEqual(shelf.identifier, f"testshelf-{shelf.id}")
+
+    def test_edit_shelf_name_not_editable(self, *_):
+        """can't change the name of an non-editable shelf"""
+        view = views.Shelf.as_view()
+        shelf = self.local_user.shelf_set.get(identifier="to-read")
+        self.assertEqual(shelf.privacy, "public")
+
+        request = self.factory.post(
+            "", {"privacy": "public", "user": self.local_user.id, "name": "cool name"}
+        )
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, request.user.username, shelf.identifier)
+
+        self.assertEqual(shelf.name, "To Read")

bookwyrm/tests/views/shelf/test_shelf_actions.py

@@ -3,13 +3,10 @@ import json
 from unittest.mock import patch
 
 from django.core.exceptions import PermissionDenied
-from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
 from bookwyrm import forms, models, views
-from bookwyrm.activitypub import ActivitypubResponse
-from bookwyrm.tests.validate_html import validate_html
 
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
@@ -17,7 +14,7 @@ from bookwyrm.tests.validate_html import validate_html
 @patch("bookwyrm.activitystreams.populate_stream_task.delay")
 @patch("bookwyrm.activitystreams.add_book_statuses_task.delay")
 @patch("bookwyrm.activitystreams.remove_book_statuses_task.delay")
-class ShelfViews(TestCase):
+class ShelfActionViews(TestCase):
     """tag views"""
 
     def setUp(self):
@@ -46,85 +43,6 @@ class ShelfViews(TestCase):
             )
         models.SiteSettings.objects.create()
 
-    def test_shelf_page(self, *_):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.Shelf.as_view()
-        shelf = self.local_user.shelf_set.first()
-        request = self.factory.get("")
-        request.user = self.local_user
-        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
-            is_api.return_value = False
-            result = view(request, self.local_user.username, shelf.identifier)
-        self.assertIsInstance(result, TemplateResponse)
-        validate_html(result.render())
-        self.assertEqual(result.status_code, 200)
-
-        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
-            is_api.return_value = True
-            result = view(request, self.local_user.username, shelf.identifier)
-        self.assertIsInstance(result, ActivitypubResponse)
-        self.assertEqual(result.status_code, 200)
-
-        request = self.factory.get("/?page=1")
-        request.user = self.local_user
-        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
-            is_api.return_value = True
-            result = view(request, self.local_user.username, shelf.identifier)
-        self.assertIsInstance(result, ActivitypubResponse)
-        self.assertEqual(result.status_code, 200)
-
-    def test_edit_shelf_privacy(self, *_):
-        """set name or privacy on shelf"""
-        view = views.Shelf.as_view()
-        shelf = self.local_user.shelf_set.get(identifier="to-read")
-        self.assertEqual(shelf.privacy, "public")
-
-        request = self.factory.post(
-            "",
-            {
-                "privacy": "unlisted",
-                "user": self.local_user.id,
-                "name": "To Read",
-            },
-        )
-        request.user = self.local_user
-        view(request, self.local_user.username, shelf.identifier)
-        shelf.refresh_from_db()
-
-        self.assertEqual(shelf.privacy, "unlisted")
-
-    def test_edit_shelf_name(self, *_):
-        """change the name of an editable shelf"""
-        view = views.Shelf.as_view()
-        shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
-        self.assertEqual(shelf.privacy, "public")
-
-        request = self.factory.post(
-            "", {"privacy": "public", "user": self.local_user.id, "name": "cool name"}
-        )
-        request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, request.user.username, shelf.identifier)
-        shelf.refresh_from_db()
-
-        self.assertEqual(shelf.name, "cool name")
-        self.assertEqual(shelf.identifier, f"testshelf-{shelf.id}")
-
-    def test_edit_shelf_name_not_editable(self, *_):
-        """can't change the name of an non-editable shelf"""
-        view = views.Shelf.as_view()
-        shelf = self.local_user.shelf_set.get(identifier="to-read")
-        self.assertEqual(shelf.privacy, "public")
-
-        request = self.factory.post(
-            "", {"privacy": "public", "user": self.local_user.id, "name": "cool name"}
-        )
-        request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, request.user.username, shelf.identifier)
-
-        self.assertEqual(shelf.name, "To Read")
-
     def test_shelve(self, *_):
         """shelve a book"""
         request = self.factory.post(
@@ -182,6 +100,30 @@ class ShelfViews(TestCase):
         # make sure the book is on the shelf
         self.assertEqual(shelf.books.get(), self.book)
 
+    def test_shelve_read_with_change_shelf(self, *_):
+        """special behavior for the read shelf"""
+        previous_shelf = models.Shelf.objects.get(identifier="reading")
+        models.ShelfBook.objects.create(
+            shelf=previous_shelf, user=self.local_user, book=self.book
+        )
+        shelf = models.Shelf.objects.get(identifier="read")
+
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "shelf": shelf.identifier,
+                "change-shelf-from": previous_shelf.identifier,
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.shelve(request)
+        # make sure the book is on the shelf
+        self.assertEqual(shelf.books.get(), self.book)
+        self.assertEqual(list(previous_shelf.books.all()), [])
+
     def test_unshelve(self, *_):
         """remove a book from a shelf"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

bookwyrm/tests/views/test_author.py

@@ -1,6 +1,7 @@
 """ test for app action functionality """
 from unittest.mock import patch
-from django.contrib.auth.models import Group, Permission
+
+from django.contrib.auth.models import AnonymousUser, Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.template.response import TemplateResponse
@@ -44,6 +45,8 @@ class AuthorViews(TestCase):
             parent_work=self.work,
         )
 
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
     def test_author_page(self):
@@ -51,15 +54,33 @@ class AuthorViews(TestCase):
         view = views.Author.as_view()
         author = models.Author.objects.create(name="Jessica")
         request = self.factory.get("")
+        request.user = self.local_user
         with patch("bookwyrm.views.author.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, author.id)
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
+
+    def test_author_page_logged_out(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Author.as_view()
+        author = models.Author.objects.create(name="Jessica")
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+        with patch("bookwyrm.views.author.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, author.id)
+        self.assertIsInstance(result, TemplateResponse)
+        validate_html(result.render())
         self.assertEqual(result.status_code, 200)
 
+    def test_author_page_api_response(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Author.as_view()
+        author = models.Author.objects.create(name="Jessica")
         request = self.factory.get("")
+        request.user = self.local_user
         with patch("bookwyrm.views.author.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, author.id)
@@ -78,7 +99,6 @@ class AuthorViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         validate_html(result.render())
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.status_code, 200)
 
     def test_edit_author(self):
         """edit an author"""
@@ -126,5 +146,5 @@ class AuthorViews(TestCase):
         resp = view(request, author.id)
         author.refresh_from_db()
         self.assertEqual(author.name, "Test Author")
-        resp.render()
+        validate_html(resp.render())
         self.assertEqual(resp.status_code, 200)