diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index d8b846464..b01ede4cb 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,9 +1,5 @@
-
- {{ book.title }}
-
+
{{ book.title }}
{% if book.authors %}
-
- by {% include 'snippets/authors.html' with book=book %}
-
+by {% include 'snippets/authors.html' with book=book %}
{% endif %}
diff --git a/bookwyrm/templates/snippets/status_content.html b/bookwyrm/templates/snippets/status_content.html
index 95d6f8eec..d26636535 100644
--- a/bookwyrm/templates/snippets/status_content.html
+++ b/bookwyrm/templates/snippets/status_content.html
@@ -43,7 +43,7 @@
diff --git a/bookwyrm/tests/data/ap_generated_shelve_note.json b/bookwyrm/tests/data/ap_generated_shelve_note.json
new file mode 100644
index 000000000..cc2fc7b7d
--- /dev/null
+++ b/bookwyrm/tests/data/ap_generated_shelve_note.json
@@ -0,0 +1,52 @@
+{
+ "id": "https://example.com/users/rat/generatednote/2567/activity",
+ "type": "Create",
+ "actor": "https://example.com/users/rat",
+ "object": {
+ "id": "https://example.com/users/rat/generatednote/2567",
+ "type": "GeneratedNote",
+ "url": null,
+ "inReplyTo": null,
+ "published": "2020-12-16T01:45:19.662734+00:00",
+ "attributedTo": "https://example.com/users/rat",
+ "to": [
+ "https://www.w3.org/ns/activitystreams#Public"
+ ],
+ "cc": [
+ "https://example.com/users/rat/followers"
+ ],
+ "content": "wants to read",
+ "replies": {
+ "id": "https://example.com/users/rat/generatednote/2567/replies",
+ "type": "OrderedCollection",
+ "totalItems": 0,
+ "first": "https://example.com/users/rat/generatednote/2567/replies?page=true",
+ "last": "https://example.com/users/rat/generatednote/2567/replies?page=true",
+ "name": "",
+ "@context": "https://www.w3.org/ns/activitystreams"
+ },
+ "tag": [
+ {
+ "href": "https://bookwyrm.social/book/37292",
+ "name": "Female Husbands",
+ "type": "Book"
+ }
+ ],
+ "attachment": [],
+ "sensitive": false,
+ "@context": "https://www.w3.org/ns/activitystreams"
+ },
+ "to": [
+ "https://example.com/users/rat/followers"
+ ],
+ "cc": [
+ "https://www.w3.org/ns/activitystreams#Public"
+ ],
+ "signature": {
+ "creator": "https://example.com/users/rat#main-key",
+ "created": "2020-12-16T01:45:19.662734+00:00",
+ "signatureValue": "R+W8nN1CQAlREjSUeaQwJXZrXTOOLvpHQi9n/3vd8QKq+l6HJEpu7eAht9fjpk8YOKEgV3OUQ7w3E42wM4t+sFiaPoQjY6Xy9IOvx/2LcOZjSOtTkiZ1XnnVb3DSbl8BOBH02+cPvoR6k4LIPHm2IHYZ1UL02WdDWaicHEwl7bw=",
+ "type": "RsaSignature2017"
+ },
+ "@context": "https://www.w3.org/ns/activitystreams"
+}
diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py
index c703d08a4..d393d968c 100644
--- a/bookwyrm/tests/models/test_import_model.py
+++ b/bookwyrm/tests/models/test_import_model.py
@@ -1,9 +1,15 @@
''' testing models '''
import datetime
+import json
+import pathlib
+from unittest.mock import patch
+
from django.utils import timezone
from django.test import TestCase
+import responses
-from bookwyrm import models
+from bookwyrm import books_manager, models
+from bookwyrm.connectors.abstract_connector import SearchResult
class ImportJob(TestCase):
@@ -54,11 +60,11 @@ class ImportJob(TestCase):
user = models.User.objects.create_user(
'mouse', 'mouse@mouse.mouse', 'mouseword', local=True)
job = models.ImportJob.objects.create(user=user)
- models.ImportItem.objects.create(
+ self.item_1 = models.ImportItem.objects.create(
job=job, index=1, data=currently_reading_data)
- models.ImportItem.objects.create(
+ self.item_2 = models.ImportItem.objects.create(
job=job, index=2, data=read_data)
- models.ImportItem.objects.create(
+ self.item_3 = models.ImportItem.objects.create(
job=job, index=3, data=unknown_read_data)
@@ -72,8 +78,7 @@ class ImportJob(TestCase):
def test_shelf(self):
''' converts to the local shelf typology '''
expected = 'reading'
- item = models.ImportItem.objects.get(index=1)
- self.assertEqual(item.shelf, expected)
+ self.assertEqual(self.item_1.shelf, expected)
def test_date_added(self):
@@ -91,21 +96,75 @@ class ImportJob(TestCase):
def test_currently_reading_reads(self):
+ ''' infer currently reading dates where available '''
expected = [models.ReadThrough(
- start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))]
+ start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
+ )]
actual = models.ImportItem.objects.get(index=1)
self.assertEqual(actual.reads[0].start_date, expected[0].start_date)
self.assertEqual(actual.reads[0].finish_date, expected[0].finish_date)
def test_read_reads(self):
- actual = models.ImportItem.objects.get(index=2)
- self.assertEqual(actual.reads[0].start_date, datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))
- self.assertEqual(actual.reads[0].finish_date, datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc))
+ ''' infer read dates where available '''
+ actual = self.item_2
+ self.assertEqual(
+ actual.reads[0].start_date,
+ datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))
+ self.assertEqual(
+ actual.reads[0].finish_date,
+ datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc))
def test_unread_reads(self):
+ ''' handle books with no read dates '''
expected = []
actual = models.ImportItem.objects.get(index=3)
self.assertEqual(actual.reads, expected)
+ @responses.activate
+ def test_get_book_from_isbn(self):
+ ''' search and load books by isbn (9780356506999) '''
+ connector_info = models.Connector.objects.create(
+ identifier='openlibrary.org',
+ name='OpenLibrary',
+ connector_file='openlibrary',
+ base_url='https://openlibrary.org',
+ books_url='https://openlibrary.org',
+ covers_url='https://covers.openlibrary.org',
+ search_url='https://openlibrary.org/search?q=',
+ priority=3,
+ )
+ connector = books_manager.load_connector(connector_info)
+ result = SearchResult(
+ title='Test Result',
+ key='https://openlibrary.org/works/OL1234W',
+ author='An Author',
+ year='1980',
+ connector=connector,
+ )
+
+ datafile = pathlib.Path(__file__).parent.joinpath(
+ '../data/ol_edition.json')
+ bookdata = json.loads(datafile.read_bytes())
+ responses.add(
+ responses.GET,
+ 'https://openlibrary.org/works/OL1234W',
+ json=bookdata,
+ status=200)
+ responses.add(
+ responses.GET,
+ 'https://openlibrary.org//works/OL15832982W',
+ json=bookdata,
+ status=200)
+ responses.add(
+ responses.GET,
+ 'https://openlibrary.org//authors/OL382982A.json',
+ json={'name': 'test author'},
+ status=200)
+
+ with patch('bookwyrm.books_manager.first_search_result') as search:
+ search.return_value = result
+ book = self.item_1.get_book_from_isbn()
+
+ self.assertEqual(book.title, 'Sabriel')
diff --git a/bookwyrm/tests/outgoing/__init__.py b/bookwyrm/tests/outgoing/__init__.py
deleted file mode 100644
index b6e690fd5..000000000
--- a/bookwyrm/tests/outgoing/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import *
diff --git a/bookwyrm/tests/outgoing/test_follow.py b/bookwyrm/tests/outgoing/test_follow.py
deleted file mode 100644
index d27db8761..000000000
--- a/bookwyrm/tests/outgoing/test_follow.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from unittest.mock import patch
-from django.test import TestCase
-
-from bookwyrm import models, outgoing
-from bookwyrm.settings import DOMAIN
-
-
-class Following(TestCase):
- def setUp(self):
- with patch('bookwyrm.models.user.set_remote_server'):
- 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,
- remote_id='http://local.com/users/mouse',
- )
-
-
- def test_handle_follow(self):
- self.assertEqual(models.UserFollowRequest.objects.count(), 0)
-
- with patch('bookwyrm.broadcast.broadcast_task.delay'):
- outgoing.handle_follow(self.local_user, self.remote_user)
-
- rel = models.UserFollowRequest.objects.get()
-
- self.assertEqual(rel.user_subject, self.local_user)
- self.assertEqual(rel.user_object, self.remote_user)
- self.assertEqual(rel.status, 'follow_request')
-
-
- def test_handle_unfollow(self):
- self.remote_user.followers.add(self.local_user)
- self.assertEqual(self.remote_user.followers.count(), 1)
- with patch('bookwyrm.broadcast.broadcast_task.delay'):
- outgoing.handle_unfollow(self.local_user, self.remote_user)
-
- self.assertEqual(self.remote_user.followers.count(), 0)
-
-
- def test_handle_accept(self):
- rel = models.UserFollowRequest.objects.create(
- user_subject=self.local_user,
- user_object=self.remote_user
- )
- rel_id = rel.id
-
- with patch('bookwyrm.broadcast.broadcast_task.delay'):
- outgoing.handle_accept(rel)
- # request should be deleted
- self.assertEqual(
- models.UserFollowRequest.objects.filter(id=rel_id).count(), 0
- )
- # follow relationship should exist
- self.assertEqual(self.remote_user.followers.first(), self.local_user)
-
-
- def test_handle_reject(self):
- rel = models.UserFollowRequest.objects.create(
- user_subject=self.local_user,
- user_object=self.remote_user
- )
- rel_id = rel.id
-
- with patch('bookwyrm.broadcast.broadcast_task.delay'):
- outgoing.handle_reject(rel)
- # request should be deleted
- self.assertEqual(
- models.UserFollowRequest.objects.filter(id=rel_id).count(), 0
- )
- # follow relationship should not exist
- self.assertEqual(
- models.UserFollows.objects.filter(id=rel_id).count(), 0
- )
diff --git a/bookwyrm/tests/outgoing/test_remote_webfinger.py b/bookwyrm/tests/outgoing/test_remote_webfinger.py
deleted file mode 100644
index 1bf884a6e..000000000
--- a/bookwyrm/tests/outgoing/test_remote_webfinger.py
+++ /dev/null
@@ -1,61 +0,0 @@
-''' testing user lookup '''
-import json
-import pathlib
-from unittest.mock import patch
-
-from django.test import TestCase
-import responses
-
-from bookwyrm import models, outgoing
-from bookwyrm.settings import DOMAIN
-
-class TestOutgoingRemoteWebfinger(TestCase):
- ''' overwrites standard model feilds to work with activitypub '''
- def setUp(self):
- ''' get user data ready '''
- datafile = pathlib.Path(__file__).parent.joinpath(
- '../data/ap_user.json'
- )
- self.userdata = json.loads(datafile.read_bytes())
- del self.userdata['icon']
-
- def test_existing_user(self):
- ''' simple database lookup by username '''
- user = models.User.objects.create_user(
- 'mouse', 'mouse@mouse.mouse', 'mouseword', local=True)
-
- result = outgoing.handle_remote_webfinger('@mouse@%s' % DOMAIN)
- self.assertEqual(result, user)
-
- result = outgoing.handle_remote_webfinger('mouse@%s' % DOMAIN)
- self.assertEqual(result, user)
-
-
- @responses.activate
- def test_load_user(self):
- username = 'mouse@example.com'
- wellknown = {
- "subject": "acct:mouse@example.com",
- "links": [
- {
- "rel": "self",
- "type": "application/activity+json",
- "href": "https://example.com/user/mouse"
- }
- ]
- }
- responses.add(
- responses.GET,
- 'https://example.com/.well-known/webfinger?resource=acct:%s' \
- % username,
- json=wellknown,
- status=200)
- responses.add(
- responses.GET,
- 'https://example.com/user/mouse',
- json=self.userdata,
- status=200)
- with patch('bookwyrm.models.user.set_remote_server.delay'):
- result = outgoing.handle_remote_webfinger('@mouse@example.com')
- self.assertIsInstance(result, models.User)
- self.assertEqual(result.username, 'mouse@example.com')
diff --git a/bookwyrm/tests/outgoing/test_shelving.py b/bookwyrm/tests/outgoing/test_shelving.py
deleted file mode 100644
index 5567784e5..000000000
--- a/bookwyrm/tests/outgoing/test_shelving.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from unittest.mock import patch
-from django.test import TestCase
-
-from bookwyrm import models, outgoing
-
-
-class Shelving(TestCase):
- def setUp(self):
- self.user = models.User.objects.create_user(
- 'mouse', 'mouse@mouse.com', 'mouseword',
- local=True,
- remote_id='http://local.com/users/mouse',
- )
- work = models.Work.objects.create(
- title='Example work',
- )
- self.book = models.Edition.objects.create(
- title='Example Edition',
- remote_id='https://example.com/book/1',
- parent_work=work,
- )
- self.shelf = models.Shelf.objects.create(
- name='Test Shelf',
- identifier='test-shelf',
- user=self.user
- )
-
-
- def test_handle_shelve(self):
- with patch('bookwyrm.broadcast.broadcast_task.delay') as _:
- outgoing.handle_shelve(self.user, self.book, self.shelf)
- # make sure the book is on the shelf
- self.assertEqual(self.shelf.books.get(), self.book)
-
-
- def test_handle_shelve_to_read(self):
- shelf = models.Shelf.objects.get(identifier='to-read')
-
- with patch('bookwyrm.broadcast.broadcast_task.delay') as _:
- outgoing.handle_shelve(self.user, self.book, shelf)
- # make sure the book is on the shelf
- self.assertEqual(shelf.books.get(), self.book)
-
-
- def test_handle_shelve_reading(self):
- shelf = models.Shelf.objects.get(identifier='reading')
-
- with patch('bookwyrm.broadcast.broadcast_task.delay') as _:
- outgoing.handle_shelve(self.user, self.book, shelf)
- # make sure the book is on the shelf
- self.assertEqual(shelf.books.get(), self.book)
-
-
- def test_handle_shelve_read(self):
- shelf = models.Shelf.objects.get(identifier='read')
-
- with patch('bookwyrm.broadcast.broadcast_task.delay') as _:
- outgoing.handle_shelve(self.user, self.book, shelf)
- # make sure the book is on the shelf
- self.assertEqual(shelf.books.get(), self.book)
-
-
- def test_handle_unshelve(self):
- self.shelf.books.add(self.book)
- self.shelf.save()
- self.assertEqual(self.shelf.books.count(), 1)
- with patch('bookwyrm.broadcast.broadcast_task.delay') as _:
- outgoing.handle_unshelve(self.user, self.book, self.shelf)
- self.assertEqual(self.shelf.books.count(), 0)
diff --git a/bookwyrm/tests/test_incoming.py b/bookwyrm/tests/test_incoming.py
index 7e58da867..0269c64ca 100644
--- a/bookwyrm/tests/test_incoming.py
+++ b/bookwyrm/tests/test_incoming.py
@@ -8,6 +8,7 @@ from django.http import HttpResponseBadRequest, HttpResponseNotAllowed, \
HttpResponseNotFound
from django.test import TestCase
from django.test.client import RequestFactory
+import responses
from bookwyrm import models, incoming
@@ -421,6 +422,25 @@ class Incoming(TestCase):
self.assertEqual(notification.related_status, self.status)
+ @responses.activate
+ def test_handle_discarded_boost(self):
+ ''' test a boost of a mastodon status that will be discarded '''
+ activity = {
+ 'type': 'Announce',
+ 'id': 'http://www.faraway.com/boost/12',
+ 'actor': self.remote_user.remote_id,
+ 'object': self.status.to_activity(),
+ }
+ responses.add(
+ responses.GET,
+ 'http://www.faraway.com/boost/12',
+ json={'id': 'http://www.faraway.com/boost/12'},
+ status=200)
+ incoming.handle_boost(activity)
+ self.assertEqual(models.Boost.objects.count(), 0)
+
+
+
def test_handle_unboost(self):
''' undo a boost '''
activity = {
diff --git a/bookwyrm/tests/test_outgoing.py b/bookwyrm/tests/test_outgoing.py
new file mode 100644
index 000000000..2c1d119cc
--- /dev/null
+++ b/bookwyrm/tests/test_outgoing.py
@@ -0,0 +1,193 @@
+''' sending out activities '''
+import json
+import pathlib
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, outgoing
+from bookwyrm.settings import DOMAIN
+
+
+class Outgoing(TestCase):
+ ''' sends out activities '''
+ def setUp(self):
+ ''' we'll need some data '''
+ with patch('bookwyrm.models.user.set_remote_server'):
+ 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,
+ remote_id='https://example.com/users/mouse',
+ )
+
+ datafile = pathlib.Path(__file__).parent.joinpath(
+ 'data/ap_user.json'
+ )
+ self.userdata = json.loads(datafile.read_bytes())
+ del self.userdata['icon']
+
+ 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.shelf = models.Shelf.objects.create(
+ name='Test Shelf',
+ identifier='test-shelf',
+ user=self.local_user
+ )
+
+
+ def test_handle_follow(self):
+ ''' send a follow request '''
+ self.assertEqual(models.UserFollowRequest.objects.count(), 0)
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_follow(self.local_user, self.remote_user)
+
+ rel = models.UserFollowRequest.objects.get()
+
+ self.assertEqual(rel.user_subject, self.local_user)
+ self.assertEqual(rel.user_object, self.remote_user)
+ self.assertEqual(rel.status, 'follow_request')
+
+
+ def test_handle_unfollow(self):
+ ''' send an unfollow '''
+ self.remote_user.followers.add(self.local_user)
+ self.assertEqual(self.remote_user.followers.count(), 1)
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_unfollow(self.local_user, self.remote_user)
+
+ self.assertEqual(self.remote_user.followers.count(), 0)
+
+
+ def test_handle_accept(self):
+ ''' accept a follow request '''
+ rel = models.UserFollowRequest.objects.create(
+ user_subject=self.local_user,
+ user_object=self.remote_user
+ )
+ rel_id = rel.id
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_accept(rel)
+ # request should be deleted
+ self.assertEqual(
+ models.UserFollowRequest.objects.filter(id=rel_id).count(), 0
+ )
+ # follow relationship should exist
+ self.assertEqual(self.remote_user.followers.first(), self.local_user)
+
+
+ def test_handle_reject(self):
+ ''' reject a follow request '''
+ rel = models.UserFollowRequest.objects.create(
+ user_subject=self.local_user,
+ user_object=self.remote_user
+ )
+ rel_id = rel.id
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_reject(rel)
+ # request should be deleted
+ self.assertEqual(
+ models.UserFollowRequest.objects.filter(id=rel_id).count(), 0
+ )
+ # follow relationship should not exist
+ self.assertEqual(
+ models.UserFollows.objects.filter(id=rel_id).count(), 0
+ )
+
+ def test_existing_user(self):
+ ''' simple database lookup by username '''
+ result = outgoing.handle_remote_webfinger('@mouse@%s' % DOMAIN)
+ self.assertEqual(result, self.local_user)
+
+ result = outgoing.handle_remote_webfinger('mouse@%s' % DOMAIN)
+ self.assertEqual(result, self.local_user)
+
+
+ @responses.activate
+ def test_load_user(self):
+ ''' find a remote user using webfinger '''
+ username = 'mouse@example.com'
+ wellknown = {
+ "subject": "acct:mouse@example.com",
+ "links": [{
+ "rel": "self",
+ "type": "application/activity+json",
+ "href": "https://example.com/user/mouse"
+ }]
+ }
+ responses.add(
+ responses.GET,
+ 'https://example.com/.well-known/webfinger?resource=acct:%s' \
+ % username,
+ json=wellknown,
+ status=200)
+ responses.add(
+ responses.GET,
+ 'https://example.com/user/mouse',
+ json=self.userdata,
+ status=200)
+ with patch('bookwyrm.models.user.set_remote_server.delay'):
+ result = outgoing.handle_remote_webfinger('@mouse@example.com')
+ self.assertIsInstance(result, models.User)
+ self.assertEqual(result.username, 'mouse@example.com')
+
+
+ def test_handle_shelve(self):
+ ''' shelve a book '''
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_shelve(self.local_user, self.book, self.shelf)
+ # make sure the book is on the shelf
+ self.assertEqual(self.shelf.books.get(), self.book)
+
+
+ def test_handle_shelve_to_read(self):
+ ''' special behavior for the to-read shelf '''
+ shelf = models.Shelf.objects.get(identifier='to-read')
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_shelve(self.local_user, self.book, shelf)
+ # make sure the book is on the shelf
+ self.assertEqual(shelf.books.get(), self.book)
+
+
+ def test_handle_shelve_reading(self):
+ ''' special behavior for the reading shelf '''
+ shelf = models.Shelf.objects.get(identifier='reading')
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_shelve(self.local_user, self.book, shelf)
+ # make sure the book is on the shelf
+ self.assertEqual(shelf.books.get(), self.book)
+
+
+ def test_handle_shelve_read(self):
+ ''' special behavior for the read shelf '''
+ shelf = models.Shelf.objects.get(identifier='read')
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_shelve(self.local_user, self.book, shelf)
+ # make sure the book is on the shelf
+ self.assertEqual(shelf.books.get(), self.book)
+
+
+ def test_handle_unshelve(self):
+ ''' remove a book from a shelf '''
+ self.shelf.books.add(self.book)
+ self.shelf.save()
+ self.assertEqual(self.shelf.books.count(), 1)
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ outgoing.handle_unshelve(self.local_user, self.book, self.shelf)
+ self.assertEqual(self.shelf.books.count(), 0)
diff --git a/bookwyrm/tests/test_view_actions.py b/bookwyrm/tests/test_view_actions.py
index 77584c90b..c846c2481 100644
--- a/bookwyrm/tests/test_view_actions.py
+++ b/bookwyrm/tests/test_view_actions.py
@@ -2,11 +2,13 @@
from unittest.mock import patch
from django.core.exceptions import PermissionDenied
+from django.contrib.auth.models import Group, Permission
+from django.contrib.contenttypes.models import ContentType
from django.http.response import Http404
from django.test import TestCase
from django.test.client import RequestFactory
-from bookwyrm import view_actions as actions, models
+from bookwyrm import forms, models, view_actions as actions
from bookwyrm.settings import DOMAIN
@@ -19,6 +21,13 @@ class ViewActions(TestCase):
'mouse', 'mouse@mouse.com', 'mouseword', local=True)
self.local_user.remote_id = 'https://example.com/user/mouse'
self.local_user.save()
+ self.group = Group.objects.create(name='editor')
+ self.group.permissions.add(
+ Permission.objects.create(
+ name='edit_book',
+ codename='edit_book',
+ content_type=ContentType.objects.get_for_model(models.User)).id
+ )
with patch('bookwyrm.models.user.set_remote_server.delay'):
self.remote_user = models.User.objects.create_user(
'rat', 'rat@rat.com', 'ratword',
@@ -238,6 +247,43 @@ class ViewActions(TestCase):
self.assertEqual(resp.template_name, 'password_reset.html')
self.assertTrue(models.PasswordReset.objects.exists())
+
+ def test_password_change(self):
+ ''' change password '''
+ password_hash = self.local_user.password
+ request = self.factory.post('', {
+ 'password': 'hi',
+ 'confirm-password': 'hi'
+ })
+ request.user = self.local_user
+ with patch('bookwyrm.view_actions.login'):
+ actions.password_change(request)
+ self.assertNotEqual(self.local_user.password, password_hash)
+
+ def test_password_change_mismatch(self):
+ ''' change password '''
+ password_hash = self.local_user.password
+ request = self.factory.post('', {
+ 'password': 'hi',
+ 'confirm-password': 'hihi'
+ })
+ request.user = self.local_user
+ actions.password_change(request)
+ self.assertEqual(self.local_user.password, password_hash)
+
+
+ def test_edit_user(self):
+ ''' use a form to update a user '''
+ form = forms.EditUserForm(instance=self.local_user)
+ form.data['name'] = 'New Name'
+ request = self.factory.post('', form.data)
+ request.user = self.local_user
+
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ actions.edit_profile(request)
+ self.assertEqual(self.local_user.name, 'New Name')
+
+
def test_switch_edition(self):
''' updates user's relationships to a book '''
work = models.Work.objects.create(title='test work')
@@ -262,3 +308,46 @@ class ViewActions(TestCase):
self.assertEqual(models.ShelfBook.objects.get().book, edition2)
self.assertEqual(models.ReadThrough.objects.get().book, edition2)
+
+
+ def test_edit_author(self):
+ ''' edit an author '''
+ author = models.Author.objects.create(name='Test Author')
+ self.local_user.groups.add(self.group)
+ form = forms.AuthorForm(instance=author)
+ form.data['name'] = 'New Name'
+ form.data['last_edited_by'] = self.local_user.id
+ request = self.factory.post('', form.data)
+ request.user = self.local_user
+ with patch('bookwyrm.broadcast.broadcast_task.delay'):
+ actions.edit_author(request, author.id)
+ author.refresh_from_db()
+ self.assertEqual(author.name, 'New Name')
+ self.assertEqual(author.last_edited_by, self.local_user)
+
+ def test_edit_author_non_editor(self):
+ ''' edit an author with invalid post data'''
+ author = models.Author.objects.create(name='Test Author')
+ form = forms.AuthorForm(instance=author)
+ form.data['name'] = 'New Name'
+ form.data['last_edited_by'] = self.local_user.id
+ request = self.factory.post('', form.data)
+ request.user = self.local_user
+ with self.assertRaises(PermissionDenied):
+ actions.edit_author(request, author.id)
+ author.refresh_from_db()
+ self.assertEqual(author.name, 'Test Author')
+
+ def test_edit_author_invalid_form(self):
+ ''' edit an author with invalid post data'''
+ author = models.Author.objects.create(name='Test Author')
+ self.local_user.groups.add(self.group)
+ form = forms.AuthorForm(instance=author)
+ form.data['name'] = ''
+ form.data['last_edited_by'] = self.local_user.id
+ request = self.factory.post('', form.data)
+ request.user = self.local_user
+ resp = actions.edit_author(request, author.id)
+ author.refresh_from_db()
+ self.assertEqual(author.name, 'Test Author')
+ self.assertEqual(resp.template_name, 'edit_author.html')
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index e6c3f79f2..22edd38a8 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -76,6 +76,7 @@ urlpatterns = [
# books
re_path(r'%s(.json)?/?$' % book_path, views.book_page),
re_path(r'%s/edit/?$' % book_path, views.edit_book_page),
+ re_path(r'^author/(?P
[\w\-]+)/edit/?$', views.edit_author_page),
re_path(r'%s/editions(.json)?/?$' % book_path, views.editions_page),
re_path(r'^author/(?P[\w\-]+)(.json)?/?$', views.author_page),
@@ -104,6 +105,7 @@ urlpatterns = [
re_path(r'^edit-book/(?P\d+)/?$', actions.edit_book),
re_path(r'^upload-cover/(?P\d+)/?$', actions.upload_cover),
re_path(r'^add-description/(?P\d+)/?$', actions.add_description),
+ re_path(r'^edit-author/(?P\d+)/?$', actions.edit_author),
re_path(r'^switch-edition/?$', actions.switch_edition),
re_path(r'^edit-readthrough/?$', actions.edit_readthrough),
diff --git a/bookwyrm/view_actions.py b/bookwyrm/view_actions.py
index c3e4d2be7..78f762185 100644
--- a/bookwyrm/view_actions.py
+++ b/bookwyrm/view_actions.py
@@ -159,23 +159,21 @@ def password_change(request):
request.user.set_password(new_password)
request.user.save()
login(request, request.user)
- return redirect('/user-edit')
+ return redirect('/user/%s' % request.user.localname)
@login_required
@require_POST
def edit_profile(request):
''' les get fancy with images '''
- form = forms.EditUserForm(request.POST, request.FILES)
+ form = forms.EditUserForm(
+ request.POST, request.FILES, instance=request.user)
if not form.is_valid():
- data = {
- 'form': form,
- 'user': request.user,
- }
+ data = {'form': form, 'user': request.user}
return TemplateResponse(request, 'edit_user.html', data)
- request.user.name = form.data['name']
- request.user.email = form.data['email']
+ user = form.save(commit=False)
+
if 'avatar' in form.files:
# crop and resize avatar upload
image = Image.open(form.files['avatar'])
@@ -201,17 +199,10 @@ def edit_profile(request):
# set the name to a hash
extension = form.files['avatar'].name.split('.')[-1]
filename = '%s.%s' % (uuid4(), extension)
- request.user.avatar.save(
- filename,
- ContentFile(output.getvalue())
- )
+ user.avatar.save(filename, ContentFile(output.getvalue()))
+ user.save()
- request.user.summary = form.data['summary']
- request.user.manually_approves_followers = \
- form.cleaned_data['manually_approves_followers']
- request.user.save()
-
- outgoing.handle_update_user(request.user)
+ outgoing.handle_update_user(user)
return redirect('/user/%s' % request.user.localname)
@@ -244,7 +235,7 @@ def edit_book(request, book_id):
return TemplateResponse(request, 'edit_book.html', data)
book = form.save()
- outgoing.handle_update_book(request.user, book)
+ outgoing.handle_update_book_data(request.user, book)
return redirect('/book/%s' % book.id)
@@ -289,10 +280,9 @@ def upload_cover(request, book_id):
return redirect('/book/%d' % book.id)
book.cover = form.files['cover']
- book.sync_cover = False
book.save()
- outgoing.handle_update_book(request.user, book)
+ outgoing.handle_update_book_data(request.user, book)
return redirect('/book/%s' % book.id)
@@ -311,10 +301,31 @@ def add_description(request, book_id):
book.description = description
book.save()
- outgoing.handle_update_book(request.user, book)
+ outgoing.handle_update_book_data(request.user, book)
return redirect('/book/%s' % book.id)
+@login_required
+@permission_required('bookwyrm.edit_book', raise_exception=True)
+@require_POST
+def edit_author(request, author_id):
+ ''' edit a author cool '''
+ author = get_object_or_404(models.Author, id=author_id)
+
+ form = forms.AuthorForm(request.POST, request.FILES, instance=author)
+ if not form.is_valid():
+ data = {
+ 'title': 'Edit Author',
+ 'author': author,
+ 'form': form
+ }
+ return TemplateResponse(request, 'edit_author.html', data)
+ author = form.save()
+
+ outgoing.handle_update_book_data(request.user, author)
+ return redirect('/author/%s' % author.id)
+
+
@login_required
@require_POST
def create_shelf(request):
diff --git a/bookwyrm/views.py b/bookwyrm/views.py
index 8e40f3623..1afb82669 100644
--- a/bookwyrm/views.py
+++ b/bookwyrm/views.py
@@ -657,6 +657,20 @@ def edit_book_page(request, book_id):
return TemplateResponse(request, 'edit_book.html', data)
+@login_required
+@permission_required('bookwyrm.edit_book', raise_exception=True)
+@require_GET
+def edit_author_page(request, author_id):
+ ''' info about a book '''
+ author = get_object_or_404(models.Author, id=author_id)
+ data = {
+ 'title': 'Edit Author',
+ 'author': author,
+ 'form': forms.AuthorForm(instance=author)
+ }
+ return TemplateResponse(request, 'edit_author.html', data)
+
+
@require_GET
def editions_page(request, book_id):
''' list of editions of a book '''