From 873336960595a5d2da5157f4fac143e442a1b1a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adeodato=20Sim=C3=B3?= Date: Mon, 8 Apr 2024 16:15:50 -0300 Subject: [PATCH] test_quotation_page_serialization: add test with no position --- bookwyrm/models/status.py | 2 +- bookwyrm/tests/models/test_status_model.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index dc0ab45a6..d0c1e639b 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -392,7 +392,7 @@ class Quotation(BookStatus): def _format_position(self) -> Optional[str]: """serialize page position""" beg = self.position - end = self.endposition or 0 + end = self.endposition if self.position_mode != "PG" or not beg: return None return f"pp. {beg}-{end}" if end else f"p. {beg}" diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 5a7f0429b..c266999a7 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -341,6 +341,7 @@ class Status(TestCase): """serialization of quotation page position""" tests = [ ("single pos", "7", "", "p. 7"), + ("missing beg", "", "10", None), ("page range", "7", "10", "pp. 7-10"), ("page range roman", "xv", "xvi", "pp. xv-xvi"), ("page range reverse", "14", "10", "pp. 14-10"), @@ -357,10 +358,11 @@ class Status(TestCase): position_mode="PG", ) activity = status.to_activity(pure=True) - self.assertRegex( - activity["content"], - f'^

"my quote"

, {pages}

$', - ) + if pages: + expect_re = f'^

"my quote"

, {pages}

$' + else: + expect_re = '^

"my quote"

$' + self.assertRegex(activity["content"], expect_re) def test_review_to_activity(self, *_): """subclass of the base model version with a "pure" serializer"""