almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-30 18:22:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4 from FlowingCloudRTL/rui-dev

Browse source 
typo fixed, test cases fixed for the current bill types
This commit is contained in:
Ruitao Li 2022-12-12 19:03:16 -05:00 committed by GitHub
commit eabc533f01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ihatemoney/models.py
View file

@ -76,9 +76,9 @@ class Project(db.Model):
default_currency = db.Column(db.String(3))
bill_types = [
("Expense", "Expense"),
("Reimbursment", "Reimbursment"),
("Reimbursement", "Reimbursement"),
("Transfer", "Transfer"),
]
]
@property
def _to_serialize(self):

14
ihatemoney/tests/import_test.py
View file

@ -301,7 +301,7 @@ class CommonTestCase(object):
{
"date": "2017-01-01",
"what": "refund",
"bill_type": "Refund",
"bill_type": "Reimbursement",
"payer_name": "tata",
"payer_weight": 1.0,
"owers": ["fred"],
@ -353,7 +353,7 @@ class ExportTestCase(IhatemoneyTestCase):
"/raclette/add",
data={
"date": "2017-01-01",
"bill_type": "Refund",
"bill_type": "Reimbursement",
"what": "refund",
"payer": 3,
"payed_for": [2],
@ -366,7 +366,7 @@ class ExportTestCase(IhatemoneyTestCase):
expected = [
{
"date": "2017-01-01",
"bill_type": "Refund",
"bill_type": "Reimbursement",
"what": "refund",
"amount": 13.33,
"currency": "XXX",
@ -401,7 +401,7 @@ class ExportTestCase(IhatemoneyTestCase):
resp = self.client.get("/raclette/export/bills.csv")
expected = [
"date,what,bill_type,amount,currency,payer_name,payer_weight,owers",
"2017-01-01,refund,Refund,XXX,13.33,tata,1.0,fred",
"2017-01-01,refund,Reimbursement,XXX,13.33,tata,1.0,fred",
'2016-12-31,red wine,Expense,XXX,200.0,fred,1.0,"zorglub, tata"',
'2016-12-31,à raclette,Expense,10.0,XXX,zorglub,2.0,"zorglub, fred, tata, pépé"',
]
@ -493,7 +493,7 @@ class ExportTestCase(IhatemoneyTestCase):
data={
"date": "2017-01-01",
"what": "refund",
"bill_type": "Refund",
"bill_type": "Reimbursement",
"payer": 3,
"payed_for": [2],
"amount": "13.33",
@ -507,7 +507,7 @@ class ExportTestCase(IhatemoneyTestCase):
{
"date": "2017-01-01",
"what": "refund",
"bill_type": "Refund",
"bill_type": "Reimbursement",
"amount": 13.33,
"currency": "EUR",
"payer_name": "tata",
@ -541,7 +541,7 @@ class ExportTestCase(IhatemoneyTestCase):
resp = self.client.get("/raclette/export/bills.csv")
expected = [
"date,what,bill_type,amount,currency,payer_name,payer_weight,owers",
"2017-01-01,refund,Refund,13.33,EUR,tata,1.0,fred",
"2017-01-01,refund,Reimbursement,13.33,EUR,tata,1.0,fred",
'2016-12-31,poutine from Québec,Expense,100.0,CAD,fred,1.0,"zorglub, tata"',
'2016-12-31,à raclette,Expense,10.0,EUR,zorglub,2.0,"zorglub, fred, tata, pépé"',
]