From d63e5ab2d2219aa18c624750b813d60cf425b391 Mon Sep 17 00:00:00 2001
From: Thomas Versteeg <t@versteeg.email>
Date: Mon, 14 Feb 2022 18:12:08 +0100
Subject: [PATCH] Fix tests

---
 .../reading_modals/stop_reading_modal.html    |  4 +--
 bookwyrm/templatetags/shelf_tags.py           | 29 +++++++++----------
 bookwyrm/tests/models/test_user_model.py      |  2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html b/bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html
index 163a34155..93a36da54 100644
--- a/bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html
+++ b/bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html
@@ -20,10 +20,10 @@ Stop Reading "<em>{{ book_title }}</em>"
 <div class="columns">
     <div class="column is-half">
         <div class="field">
-            <label class="label" for="finish_id_start_date_{{ uuid }}">
+            <label class="label" for="stop_id_start_date_{{ uuid }}">
                 {% trans "Started reading" %}
             </label>
-            <input type="date" name="start_date" class="input" id="finish_id_start_date_{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
+            <input type="date" name="start_date" class="input" id="stop_id_start_date_{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
         </div>
     </div>
     <div class="column is-half">
diff --git a/bookwyrm/templatetags/shelf_tags.py b/bookwyrm/templatetags/shelf_tags.py
index 7aef638f4..6c4f59c36 100644
--- a/bookwyrm/templatetags/shelf_tags.py
+++ b/bookwyrm/templatetags/shelf_tags.py
@@ -36,22 +36,19 @@ def get_next_shelf(current_shelf):
 def active_shelf(context, book):
     """check what shelf a user has a book on, if any"""
     user = context["request"].user
-    return (
-        cache.get_or_set(
-            f"active_shelf-{user.id}-{book.id}",
-            lambda u, b: (
-                models.ShelfBook.objects.filter(
-                    shelf__user=u,
-                    book__parent_work__editions=b,
-                ).first()
-                or False
-            ),
-            user,
-            book,
-            timeout=15552000,
-        )
-        or {"book": book}
-    )
+    return cache.get_or_set(
+        f"active_shelf-{user.id}-{book.id}",
+        lambda u, b: (
+            models.ShelfBook.objects.filter(
+                shelf__user=u,
+                book__parent_work__editions=b,
+            ).first()
+            or False
+        ),
+        user,
+        book,
+        timeout=15552000,
+    ) or {"book": book}
 
 
 @register.simple_tag(takes_context=False)
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index e4395e2f9..471099ab9 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -53,7 +53,7 @@ class User(TestCase):
 
     def test_user_shelves(self):
         shelves = models.Shelf.objects.filter(user=self.user).all()
-        self.assertEqual(len(shelves), 3)
+        self.assertEqual(len(shelves), 4)
         names = [s.name for s in shelves]
         self.assertTrue("To Read" in names)
         self.assertTrue("Currently Reading" in names)