Merge branch 'main' into create-book

bookwyrm/tests/views/test_inbox.py

@@ -74,7 +74,7 @@ class Inbox(TestCase):
             mock_valid.return_value = False
             result = self.client.post(
                 '/user/mouse/inbox',
-                '{"type": "Test", "object": "exists"}',
+                '{"type": "Announce", "object": "exists"}',
                 content_type="application/json"
             )
             self.assertEqual(result.status_code, 401)
@@ -484,7 +484,7 @@ class Inbox(TestCase):
             'actor': 'https://example.com/users/rat',
             'type': 'Like',
             'published': 'Mon, 25 May 2020 19:31:20 GMT',
-            'object': 'https://example.com/status/1',
+            'object': self.status.remote_id,
         }
 
         views.inbox.activity_task(activity)
@@ -494,6 +494,21 @@ class Inbox(TestCase):
         self.assertEqual(fav.remote_id, 'https://example.com/fav/1')
         self.assertEqual(fav.user, self.remote_user)
 
+    def test_ignore_favorite(self):
+        ''' don't try to save an unknown status '''
+        activity = {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            'id': 'https://example.com/fav/1',
+            'actor': 'https://example.com/users/rat',
+            'type': 'Like',
+            'published': 'Mon, 25 May 2020 19:31:20 GMT',
+            'object': 'https://unknown.status/not-found',
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(models.Favorite.objects.exists())
+
     def test_handle_unfavorite(self):
         ''' fav a status '''
         activity = {

bookwyrm/tests/views/test_isbn.py

@@ -0,0 +1,54 @@
+''' test for app action functionality '''
+import json
+from unittest.mock import patch
+
+from django.http import JsonResponse
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.connectors import abstract_connector
+from bookwyrm.settings import DOMAIN
+
+
+class IsbnViews(TestCase):
+    ''' tag views'''
+    def setUp(self):
+        ''' we need basic test data and mocks '''
+        self.factory = RequestFactory()
+        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
+        )
+        models.SiteSettings.objects.create()
+
+
+    def test_isbn_json_response(self):
+        ''' searches local data only and returns book data in json format '''
+        view = views.Isbn.as_view()
+        request = self.factory.get('')
+        with patch('bookwyrm.views.isbn.is_api_request') as is_api:
+            is_api.return_value = True
+            response = view(request, isbn='1234567890123')
+        self.assertIsInstance(response, JsonResponse)
+
+        data = json.loads(response.content)
+        self.assertEqual(len(data), 1)
+        self.assertEqual(data[0]['title'], 'Test Book')
+        self.assertEqual(
+            data[0]['key'], 'https://%s/book/%d' % (DOMAIN, self.book.id))
+

bookwyrm/tests/views/test_search.py

@@ -64,6 +64,10 @@ class ShelfViews(TestCase):
                 pass
             def parse_search_data(self, data):
                 pass
+            def format_isbn_search_result(self, search_result):
+                return search_result
+            def parse_isbn_search_data(self, data):
+                return data
         models.Connector.objects.create(
             identifier='example.com',
             connector_file='openlibrary',