Update the tests with the new strings

This commit is contained in:
Alexis Métaireau 2021-10-20 00:52:27 +02:00
parent 44343ba04c
commit d9f50983fb
3 changed files with 38 additions and 33 deletions

View file

@ -232,7 +232,7 @@ class APITestCase(IhatemoneyTestCase):
# create a project # create a project
self.api_create("raclette") self.api_create("raclette")
# get the list of members (should be empty) # get the list of participants (should be empty)
req = self.client.get( req = self.client.get(
"/api/projects/raclette/members", headers=self.get_auth("raclette") "/api/projects/raclette/members", headers=self.get_auth("raclette")
) )
@ -251,7 +251,7 @@ class APITestCase(IhatemoneyTestCase):
self.assertStatus(201, req) self.assertStatus(201, req)
self.assertEqual("1\n", req.data.decode("utf-8")) self.assertEqual("1\n", req.data.decode("utf-8"))
# the list of members should contain one member # the list of participants should contain one member
req = self.client.get( req = self.client.get(
"/api/projects/raclette/members", headers=self.get_auth("raclette") "/api/projects/raclette/members", headers=self.get_auth("raclette")
) )
@ -267,7 +267,7 @@ class APITestCase(IhatemoneyTestCase):
) )
self.assertStatus(400, req) self.assertStatus(400, req)
# edit the member # edit the participant
req = self.client.put( req = self.client.put(
"/api/projects/raclette/members/1", "/api/projects/raclette/members/1",
data={"name": "Fred", "weight": 2}, data={"name": "Fred", "weight": 2},
@ -295,7 +295,7 @@ class APITestCase(IhatemoneyTestCase):
self.assertStatus(200, req) self.assertStatus(200, req)
# de-activate the user # de-activate the participant
req = self.client.put( req = self.client.put(
"/api/projects/raclette/members/1", "/api/projects/raclette/members/1",
data={"name": "Fred", "activated": False}, data={"name": "Fred", "activated": False},
@ -309,7 +309,7 @@ class APITestCase(IhatemoneyTestCase):
self.assertStatus(200, req) self.assertStatus(200, req)
self.assertEqual(False, json.loads(req.data.decode("utf-8"))["activated"]) self.assertEqual(False, json.loads(req.data.decode("utf-8"))["activated"])
# re-activate the user # re-activate the participant
req = self.client.put( req = self.client.put(
"/api/projects/raclette/members/1", "/api/projects/raclette/members/1",
data={"name": "Fred", "activated": True}, data={"name": "Fred", "activated": True},
@ -330,7 +330,7 @@ class APITestCase(IhatemoneyTestCase):
self.assertStatus(200, req) self.assertStatus(200, req)
# the list of members should be empty # the list of participants should be empty
req = self.client.get( req = self.client.get(
"/api/projects/raclette/members", headers=self.get_auth("raclette") "/api/projects/raclette/members", headers=self.get_auth("raclette")
) )
@ -342,7 +342,7 @@ class APITestCase(IhatemoneyTestCase):
# create a project # create a project
self.api_create("raclette") self.api_create("raclette")
# add members # add participants
self.api_add_member("raclette", "zorglub") self.api_add_member("raclette", "zorglub")
self.api_add_member("raclette", "fred") self.api_add_member("raclette", "fred")
self.api_add_member("raclette", "quentin") self.api_add_member("raclette", "quentin")
@ -490,7 +490,7 @@ class APITestCase(IhatemoneyTestCase):
# create a project # create a project
self.api_create("raclette") self.api_create("raclette")
# add members # add participants
self.api_add_member("raclette", "zorglub") self.api_add_member("raclette", "zorglub")
self.api_add_member("raclette", "fred") self.api_add_member("raclette", "fred")
@ -597,7 +597,7 @@ class APITestCase(IhatemoneyTestCase):
decoded_resp = json.loads(resp.data.decode("utf-8")) decoded_resp = json.loads(resp.data.decode("utf-8"))
self.assertDictEqual(decoded_resp, expected) self.assertDictEqual(decoded_resp, expected)
# Add members # Add participants
self.api_add_member("raclette", "zorglub") self.api_add_member("raclette", "zorglub")
self.api_add_member("raclette", "fred") self.api_add_member("raclette", "fred")
self.api_add_member("raclette", "quentin") self.api_add_member("raclette", "quentin")
@ -730,7 +730,7 @@ class APITestCase(IhatemoneyTestCase):
# create a project # create a project
self.api_create("raclette") self.api_create("raclette")
# add members # add participants
self.api_add_member("raclette", "zorglub") self.api_add_member("raclette", "zorglub")
self.api_add_member("raclette", "fred") self.api_add_member("raclette", "fred")
@ -786,7 +786,7 @@ class APITestCase(IhatemoneyTestCase):
self.post_project("raclette") self.post_project("raclette")
self.login("raclette") self.login("raclette")
# add members # add participants
self.api_add_member("raclette", "<script>") self.api_add_member("raclette", "<script>")
result = self.client.get("/raclette/") result = self.client.get("/raclette/")
@ -796,7 +796,7 @@ class APITestCase(IhatemoneyTestCase):
# create a project # create a project
self.api_create("raclette") self.api_create("raclette")
# add members # add participants
self.api_add_member("raclette", "zorglub") self.api_add_member("raclette", "zorglub")
self.api_add_member("raclette", "freddy familly", 4) self.api_add_member("raclette", "freddy familly", 4)
self.api_add_member("raclette", "quentin") self.api_add_member("raclette", "quentin")
@ -891,7 +891,7 @@ class APITestCase(IhatemoneyTestCase):
self.api_create("raclette") self.api_create("raclette")
self.login("raclette") self.login("raclette")
# add members # add participants
self.api_add_member("raclette", "zorglub") self.api_add_member("raclette", "zorglub")
resp = self.client.get("/raclette/history", follow_redirects=True) resp = self.client.get("/raclette/history", follow_redirects=True)

View file

@ -42,14 +42,14 @@ class BudgetTestCase(IhatemoneyTestCase):
self.assertEqual(outbox[0].recipients, ["raclette@notmyidea.org"]) self.assertEqual(outbox[0].recipients, ["raclette@notmyidea.org"])
self.assertEqual(outbox[1].recipients, ["zorglub@notmyidea.org"]) self.assertEqual(outbox[1].recipients, ["zorglub@notmyidea.org"])
# sending a message to multiple persons # sending a message to multiple participants
with self.app.mail.record_messages() as outbox: with self.app.mail.record_messages() as outbox:
self.client.post( self.client.post(
"/raclette/invite", "/raclette/invite",
data={"emails": "zorglub@notmyidea.org, toto@notmyidea.org"}, data={"emails": "zorglub@notmyidea.org, toto@notmyidea.org"},
) )
# only one message is sent to multiple persons # only one message is sent to multiple participants
self.assertEqual(len(outbox), 1) self.assertEqual(len(outbox), 1)
self.assertEqual( self.assertEqual(
outbox[0].recipients, ["zorglub@notmyidea.org", "toto@notmyidea.org"] outbox[0].recipients, ["zorglub@notmyidea.org", "toto@notmyidea.org"]
@ -67,7 +67,7 @@ class BudgetTestCase(IhatemoneyTestCase):
"/raclette/invite", data={"emails": "zorglub@notmyidea.org, zorglub"} "/raclette/invite", data={"emails": "zorglub@notmyidea.org, zorglub"}
) # not valid ) # not valid
# only one message is sent to multiple persons # only one message is sent to multiple participants
self.assertEqual(len(outbox), 0) self.assertEqual(len(outbox), 0)
def test_invite(self): def test_invite(self):
@ -318,7 +318,7 @@ class BudgetTestCase(IhatemoneyTestCase):
result = self.client.get("/raclette/") result = self.client.get("/raclette/")
# Empty bill list and no members, should now propose to add members first # Empty bill list and no members, should now propose to add participants first
self.assertIn( self.assertIn(
'You probably want to <a href="/raclette/members/add"', 'You probably want to <a href="/raclette/members/add"',
result.data.decode("utf-8"), result.data.decode("utf-8"),
@ -568,7 +568,7 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_manage_bills(self): def test_manage_bills(self):
self.post_project("raclette") self.post_project("raclette")
# add two persons # add two participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
@ -709,7 +709,7 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_weighted_balance(self): def test_weighted_balance(self):
self.post_project("raclette") self.post_project("raclette")
# add two persons # add two participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post( self.client.post(
"/raclette/members/add", data={"name": "freddy familly", "weight": 4} "/raclette/members/add", data={"name": "freddy familly", "weight": 4}
@ -756,7 +756,7 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_weighted_members_list(self): def test_weighted_members_list(self):
self.post_project("raclette") self.post_project("raclette")
# add two persons # add two participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "tata", "weight": 1}) self.client.post("/raclette/members/add", data={"name": "tata", "weight": 1})
@ -787,7 +787,7 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_rounding(self): def test_rounding(self):
self.post_project("raclette") self.post_project("raclette")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
@ -896,11 +896,11 @@ class BudgetTestCase(IhatemoneyTestCase):
# Output is checked with the USD sign # Output is checked with the USD sign
self.post_project("raclette", default_currency="USD") self.post_project("raclette", default_currency="USD")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2}) self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
# Add a member with a balance=0 : # Add a participant with a balance at 0 :
self.client.post("/raclette/members/add", data={"name": "pépé"}) self.client.post("/raclette/members/add", data={"name": "pépé"})
# create bills # create bills
@ -976,11 +976,11 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_settle(self): def test_settle(self):
self.post_project("raclette") self.post_project("raclette")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
# Add a member with a balance=0 : # Add a participant with a balance at 0 :
self.client.post("/raclette/members/add", data={"name": "pépé"}) self.client.post("/raclette/members/add", data={"name": "pépé"})
# create bills # create bills
@ -1031,7 +1031,7 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_settle_zero(self): def test_settle_zero(self):
self.post_project("raclette") self.post_project("raclette")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
@ -1086,7 +1086,7 @@ class BudgetTestCase(IhatemoneyTestCase):
self.post_project("raclette") self.post_project("raclette")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2}) self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
@ -1217,7 +1217,7 @@ class BudgetTestCase(IhatemoneyTestCase):
def test_export_with_currencies(self): def test_export_with_currencies(self):
self.post_project("raclette", default_currency="EUR") self.post_project("raclette", default_currency="EUR")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2}) self.client.post("/raclette/members/add", data={"name": "zorglub", "weight": 2})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
@ -1972,7 +1972,7 @@ class BudgetTestCase(IhatemoneyTestCase):
# A project should be editable # A project should be editable
self.post_project("raclette") self.post_project("raclette")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
self.client.post("/raclette/members/add", data={"name": "tata"}) self.client.post("/raclette/members/add", data={"name": "tata"})
@ -2099,7 +2099,7 @@ class BudgetTestCase(IhatemoneyTestCase):
# Default currency is 'XXX', but we should start from a project with a currency # Default currency is 'XXX', but we should start from a project with a currency
self.post_project("raclette", default_currency="USD") self.post_project("raclette", default_currency="USD")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})
@ -2133,7 +2133,7 @@ class BudgetTestCase(IhatemoneyTestCase):
# Default currency is 'XXX', but we should start from a project with a currency # Default currency is 'XXX', but we should start from a project with a currency
self.post_project("raclette", default_currency="USD") self.post_project("raclette", default_currency="USD")
# add members # add participants
self.client.post("/raclette/members/add", data={"name": "zorglub"}) self.client.post("/raclette/members/add", data={"name": "zorglub"})
self.client.post("/raclette/members/add", data={"name": "fred"}) self.client.post("/raclette/members/add", data={"name": "fred"})

View file

@ -697,7 +697,10 @@ def reactivate(member_id):
# Used for CSRF validation # Used for CSRF validation
form = EmptyForm() form = EmptyForm()
if not form.validate(): if not form.validate():
flash(format_form_errors(form, _("Error activating participant")), category="danger") flash(
format_form_errors(form, _("Error activating participant")),
category="danger",
)
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))
person = ( person = (
@ -717,7 +720,9 @@ def remove_member(member_id):
# Used for CSRF validation # Used for CSRF validation
form = EmptyForm() form = EmptyForm()
if not form.validate(): if not form.validate():
flash(format_form_errors(form, _("Error removing participant")), category="danger") flash(
format_form_errors(form, _("Error removing participant")), category="danger"
)
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))
member = g.project.remove_member(member_id) member = g.project.remove_member(member_id)