rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Use more f strings in status models test file

Browse source
This commit is contained in:
Mouse Reeve 2021-10-01 14:24:11 -07:00
parent 8461fe5ec3
commit 7ff040470f
1 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bookwyrm/tests/models/test_status_model.py
View file

@ -52,7 +52,7 @@ class Status(TestCase):
def test_status_generated_fields(self, *_): def test_status_generated_fields(self, *_):
"""setting remote id""" """setting remote id"""
status = models.Status.objects.create(content="bleh", user=self.local_user) status = models.Status.objects.create(content="bleh", user=self.local_user)
expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id) expected_id = f"https://{settings.DOMAIN}/user/mouse/status/{status.id}"
self.assertEqual(status.remote_id, expected_id) self.assertEqual(status.remote_id, expected_id)
self.assertEqual(status.privacy, "public") self.assertEqual(status.privacy, "public")
@ -104,7 +104,7 @@ class Status(TestCase):
) )
replies = parent.to_replies() replies = parent.to_replies()
self.assertEqual(replies["id"], "%s/replies" % parent.remote_id) self.assertEqual(replies["id"], f"{parent.remote_id}/replies")
self.assertEqual(replies["totalItems"], 2) self.assertEqual(replies["totalItems"], 2)
def test_status_to_activity(self, *_): def test_status_to_activity(self, *_):
@ -168,7 +168,7 @@ class Status(TestCase):
self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["id"], status.remote_id)
self.assertEqual( self.assertEqual(
activity["content"], activity["content"],
'mouse test content <a href="%s">"Test Edition"</a>' % self.book.remote_id, f'mouse test content <a href="{self.book.remote_id}">"Test Edition"</a>',
) )
self.assertEqual(len(activity["tag"]), 2) self.assertEqual(len(activity["tag"]), 2)
self.assertEqual(activity["type"], "Note") self.assertEqual(activity["type"], "Note")
@ -177,7 +177,7 @@ class Status(TestCase):
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
self.assertEqual( self.assertEqual(
activity["attachment"][0].url, activity["attachment"][0].url,
"https://%s%s" % (settings.DOMAIN, self.book.cover.url), f"https://{settings.DOMAIN}{self.book.cover.url}",
) )
self.assertEqual(activity["attachment"][0].name, "Test Edition") self.assertEqual(activity["attachment"][0].name, "Test Edition")
@ -202,13 +202,12 @@ class Status(TestCase):
self.assertEqual(activity["type"], "Note") self.assertEqual(activity["type"], "Note")
self.assertEqual( self.assertEqual(
activity["content"], activity["content"],
'test content<p>(comment on <a href="%s">"Test Edition"</a>)</p>' f'test content<p>(comment on <a href="{self.book.remote_id}">"Test Edition"</a>)</p>',
% self.book.remote_id,
) )
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
self.assertEqual( self.assertEqual(
activity["attachment"][0].url, activity["attachment"][0].url,
"https://%s%s" % (settings.DOMAIN, self.book.cover.url), f"https://{settings.DOMAIN}{self.book.cover.url}",
) )
self.assertEqual(activity["attachment"][0].name, "Test Edition") self.assertEqual(activity["attachment"][0].name, "Test Edition")
@ -240,13 +239,12 @@ class Status(TestCase):
self.assertEqual(activity["type"], "Note") self.assertEqual(activity["type"], "Note")
self.assertEqual( self.assertEqual(
activity["content"], activity["content"],
'a sickening sense <p>-- <a href="%s">"Test Edition"</a></p>' f'a sickening sense <p>-- <a href="{self.book.remote_id}">"Test Edition"</a></p>test content',
"test content" % self.book.remote_id,
) )
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
self.assertEqual( self.assertEqual(
activity["attachment"][0].url, activity["attachment"][0].url,
"https://%s%s" % (settings.DOMAIN, self.book.cover.url), f"https://{settings.DOMAIN}{self.book.cover.url}",
) )
self.assertEqual(activity["attachment"][0].name, "Test Edition") self.assertEqual(activity["attachment"][0].name, "Test Edition")
@ -281,13 +279,13 @@ class Status(TestCase):
self.assertEqual(activity["type"], "Article") self.assertEqual(activity["type"], "Article")
self.assertEqual( self.assertEqual(
activity["name"], activity["name"],
'Review of "%s" (3 stars): Review\'s name' % self.book.title, f'Review of "{self.book.title}" (3 stars): Review\'s name',
) )
self.assertEqual(activity["content"], "test content") self.assertEqual(activity["content"], "test content")
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
self.assertEqual( self.assertEqual(
activity["attachment"][0].url, activity["attachment"][0].url,
"https://%s%s" % (settings.DOMAIN, self.book.cover.url), f"https://{settings.DOMAIN}{self.book.cover.url}",
) )
self.assertEqual(activity["attachment"][0].name, "Test Edition") self.assertEqual(activity["attachment"][0].name, "Test Edition")
@ -303,13 +301,13 @@ class Status(TestCase):
self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["id"], status.remote_id)
self.assertEqual(activity["type"], "Article") self.assertEqual(activity["type"], "Article")
self.assertEqual( self.assertEqual(
activity["name"], 'Review of "%s": Review name' % self.book.title activity["name"], f'Review of "{self.book.title}": Review name'
) )
self.assertEqual(activity["content"], "test content") self.assertEqual(activity["content"], "test content")
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
self.assertEqual( self.assertEqual(
activity["attachment"][0].url, activity["attachment"][0].url,
"https://%s%s" % (settings.DOMAIN, self.book.cover.url), f"https://{settings.DOMAIN}{self.book.cover.url}",
) )
self.assertEqual(activity["attachment"][0].name, "Test Edition") self.assertEqual(activity["attachment"][0].name, "Test Edition")
@ -325,13 +323,12 @@ class Status(TestCase):
self.assertEqual(activity["type"], "Note") self.assertEqual(activity["type"], "Note")
self.assertEqual( self.assertEqual(
activity["content"], activity["content"],
'rated <em><a href="%s">%s</a></em>: 3 stars' f'rated <em><a href="{self.book.remote_id}">{self.book.title}</a></em>: 3 stars',
% (self.book.remote_id, self.book.title),
) )
self.assertEqual(activity["attachment"][0].type, "Document") self.assertEqual(activity["attachment"][0].type, "Document")
self.assertEqual( self.assertEqual(
activity["attachment"][0].url, activity["attachment"][0].url,
"https://%s%s" % (settings.DOMAIN, self.book.cover.url), f"https://{settings.DOMAIN}{self.book.cover.url}",
) )
self.assertEqual(activity["attachment"][0].name, "Test Edition") self.assertEqual(activity["attachment"][0].name, "Test Edition")