zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

circular import issues and added_by migration

Browse source
This commit is contained in:
Mouse Reeve 2021-02-04 14:27:26 -08:00
parent 5a3a6151a6
commit 7381536ad6
19 changed files with 273 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/tests/views/test_feed.py
View file

@ -92,7 +92,7 @@ class FeedMessageViews(TestCase):
''' gets books the ~*~ algorithm ~*~ thinks you want to post about '''
models.ShelfBook.objects.create(
book=self.book,
added_by=self.local_user,
user=self.local_user,
shelf=self.local_user.shelf_set.get(identifier='reading')
)
suggestions = views.feed.get_suggested_books(self.local_user)

16
bookwyrm/tests/views/test_list.py
View file

@ -162,7 +162,7 @@ class ListViews(TestCase):
view = views.Curate.as_view()
pending = models.ListItem.objects.create(
book_list=self.list,
added_by=self.local_user,
user=self.local_user,
book=self.book,
approved=False
)
@ -185,7 +185,7 @@ class ListViews(TestCase):
view = views.Curate.as_view()
pending = models.ListItem.objects.create(
book_list=self.list,
added_by=self.local_user,
user=self.local_user,
book=self.book,
approved=False
)
@ -211,7 +211,7 @@ class ListViews(TestCase):
views.list.add_book(request, self.list.id)
item = self.list.listitem_set.get()
self.assertEqual(item.book, self.book)
self.assertEqual(item.added_by, self.local_user)
self.assertEqual(item.user, self.local_user)
self.assertTrue(item.approved)
@ -227,7 +227,7 @@ class ListViews(TestCase):
views.list.add_book(request, self.list.id)
item = self.list.listitem_set.get()
self.assertEqual(item.book, self.book)
self.assertEqual(item.added_by, self.rat)
self.assertEqual(item.user, self.rat)
self.assertTrue(item.approved)
@ -243,7 +243,7 @@ class ListViews(TestCase):
views.list.add_book(request, self.list.id)
item = self.list.listitem_set.get()
self.assertEqual(item.book, self.book)
self.assertEqual(item.added_by, self.rat)
self.assertEqual(item.user, self.rat)
self.assertFalse(item.approved)
@ -259,7 +259,7 @@ class ListViews(TestCase):
views.list.add_book(request, self.list.id)
item = self.list.listitem_set.get()
self.assertEqual(item.book, self.book)
self.assertEqual(item.added_by, self.local_user)
self.assertEqual(item.user, self.local_user)
self.assertTrue(item.approved)
@ -267,7 +267,7 @@ class ListViews(TestCase):
''' take an item off a list '''
item = models.ListItem.objects.create(
book_list=self.list,
added_by=self.local_user,
user=self.local_user,
book=self.book,
)
self.assertTrue(self.list.listitem_set.exists())
@ -285,7 +285,7 @@ class ListViews(TestCase):
''' take an item off a list '''
item = models.ListItem.objects.create(
book_list=self.list,
added_by=self.local_user,
user=self.local_user,
book=self.book,
)
self.assertTrue(self.list.listitem_set.exists())

2
bookwyrm/tests/views/test_reading.py
View file

@ -66,7 +66,7 @@ class ReadingViews(TestCase):
''' begin a book '''
to_read_shelf = self.local_user.shelf_set.get(identifier='to-read')
models.ShelfBook.objects.create(
shelf=to_read_shelf, book=self.book, added_by=self.local_user)
shelf=to_read_shelf, book=self.book, user=self.local_user)
shelf = self.local_user.shelf_set.get(identifier='reading')
self.assertEqual(to_read_shelf.books.get(), self.book)
self.assertFalse(shelf.books.exists())