almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert whitespace mess to assertRegex() calls

Browse source
This commit is contained in:
Andrew Dickinson 2020-04-13 16:44:46 -04:00
parent e9fa30f3d4
commit 32ad3d7775
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ihatemoney/tests/tests.py
View file

@ -2248,7 +2248,10 @@ class ModelsTestCase(IhatemoneyTestCase):
self.assertEqual(bill.pay_each(), pay_each_expected) self.assertEqual(bill.pay_each(), pay_each_expected)
def em_surround(string): def em_surround(string, regex_escape=False):
if regex_escape:
return '<em class="font-italic">%s<\/em>' % string
else:
return '<em class="font-italic">%s</em>' % string return '<em class="font-italic">%s</em>' % string
@ -2600,14 +2603,14 @@ class HistoryTestCase(IhatemoneyTestCase):
"Bill %s added" % em_surround("25.0 for fromage à raclette"), "Bill %s added" % em_surround("25.0 for fromage à raclette"),
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
) )
self.assertIn( self.assertRegex(
"Bill %s:\n Amount changed\n from %s\n to %s"
% (
em_surround("25.0 for fromage à raclette"),
em_surround("25.0"),
em_surround("10.0"),
),
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
"Bill %s:\s* Amount changed\s* from %s\s* to %s"
% (
em_surround("25.0 for fromage à raclette", regex_escape=True),
em_surround("25.0", regex_escape=True),
em_surround("10.0", regex_escape=True),
),
) )
self.assertIn( self.assertIn(
"Bill %s renamed to %s" "Bill %s renamed to %s"
@ -2642,10 +2645,14 @@ class HistoryTestCase(IhatemoneyTestCase):
resp = self.client.get("/demo/history") resp = self.client.get("/demo/history")
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertIn( self.assertRegex(
"Person %s:\n Weight changed\n from %s\n to %s"
% (em_surround("alexis"), em_surround("1.0"), em_surround("2.0")),
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
"Person %s:\s* Weight changed\s* from %s\s* to %s"
% (
em_surround("alexis", regex_escape=True),
em_surround("1.0", regex_escape=True),
em_surround("2.0", regex_escape=True),
),
) )
self.assertIn( self.assertIn(
"Person %s renamed to %s" "Person %s renamed to %s"