diff --git a/ihatemoney/tests/budget_test.py b/ihatemoney/tests/budget_test.py index 99193410..72a3c776 100644 --- a/ihatemoney/tests/budget_test.py +++ b/ihatemoney/tests/budget_test.py @@ -1309,7 +1309,7 @@ class BudgetTestCase(IhatemoneyTestCase): assert abs(a - balance[m.id]) < 0.01 return - def SettleButtonTestCase(self): + def test_settle_button(self): self.post_project("raclette") # add participants @@ -1358,16 +1358,17 @@ class BudgetTestCase(IhatemoneyTestCase): project = self.get_project("raclette") transactions = project.get_transactions_to_settle_bill() - + count = 0 for t in transactions: - self.client.get("/raclette/settle"+"/"+str(t["amount"])+"/"+str(t["ower"].id)+"/"+str(t["receiver"])) + count+=1 + self.client.get("/raclette/settle"+"/"+str(t["amount"])+"/"+str(t["ower"].id)+"/"+str(t["receiver"].id)) temp_transactions = project.get_transactions_to_settle_bill() #test if the one has disappeared - assert len(temp_transactions) == len(transactions)-1 + assert len(temp_transactions) == len(transactions)-count #test if theres a new one with bill_type reimbursement - bill = models.Bill.query.one() - self.assertEqual(bill.amount, t["amount"]) + bill = project.get_newest_bill() + self.assertEqual(bill.bill_type, "Reimbursement") return def test_settle_zero(self): diff --git a/ihatemoney/tests/main_test.py b/ihatemoney/tests/main_test.py index cb33d317..b7dbc50f 100644 --- a/ihatemoney/tests/main_test.py +++ b/ihatemoney/tests/main_test.py @@ -232,7 +232,6 @@ class ModelsTestCase(IhatemoneyTestCase): self.assertEqual(bill.pay_each(), pay_each_expected) - class EmailFailureTestCase(IhatemoneyTestCase): def test_creation_email_failure_smtp(self): self.login("raclette") diff --git a/ihatemoney/web.py b/ihatemoney/web.py index 1b70cb1b..e2db7ce5 100644 --- a/ihatemoney/web.py +++ b/ihatemoney/web.py @@ -827,7 +827,7 @@ def settle(amount, ower_id, payer_id): payer_id=ower_id, project_default_currency=g.project.default_currency, bill_type="Reimbursement", - what="settlement" + what="settlement", ) session.update()