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

Add some more test and fix a discovered bug

Browse source
This commit is contained in:
Alexis Métaireau 2021-04-13 22:25:34 +02:00 committed by Glandos
parent 0fd8c26747
commit a9128261f1
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ihatemoney/models.py
View file

@ -268,8 +268,6 @@ class Project(db.Model):
# Update converted currency # Update converted currency
if new_currency != self.default_currency: if new_currency != self.default_currency:
for bill in self.get_bills(): for bill in self.get_bills():
if bill.original_currency == new_currency:
continue
if new_currency == CurrencyConverter.no_currency: if new_currency == CurrencyConverter.no_currency:
# Use old currency to flatten all amount before stripping # Use old currency to flatten all amount before stripping

51
ihatemoney/tests/tests.py
View file

@ -1568,6 +1568,11 @@ class BudgetTestCase(IhatemoneyTestCase):
self.assertEqual(member, None) self.assertEqual(member, None)
def test_currency_switch(self): def test_currency_switch(self):
mock_data = {"USD": 1, "EUR": 0.8, "CAD": 1.2}
converter = CurrencyConverter()
converter.get_rates = MagicMock(return_value=mock_data)
# A project should be editable # A project should be editable
self.post_project("raclette") self.post_project("raclette")
@ -1618,13 +1623,13 @@ class BudgetTestCase(IhatemoneyTestCase):
for bill in bills: for bill in bills:
self.assertEqual(bill.original_currency, CurrencyConverter.no_currency) self.assertEqual(bill.original_currency, CurrencyConverter.no_currency)
# Switch back to USD # Switch to USD.
project.switch_currency("USD") project.switch_currency("USD")
bills = project.get_bills() bills = project.get_bills()
for bill in bills: for bill in bills:
self.assertEqual(bill.original_currency, "USD") self.assertEqual(bill.original_currency, "USD")
# Add bill with other currency # Add bill in EUR.
self.client.post( self.client.post(
"/raclette/add", "/raclette/add",
data={ data={
@ -1637,14 +1642,36 @@ class BudgetTestCase(IhatemoneyTestCase):
}, },
) )
new_currency = "CAD" # Add one bill in CAD.
project.switch_currency(new_currency) self.client.post(
bills = project.get_bills() "/raclette/add",
for bill in bills: data={
if bill.original_currency == new_currency: "date": "2017-01-01",
self.assertEqual(bill.amount, bill.converted_amount) "what": "other country",
else: "payer": 3,
self.assertNotEqual(bill.amount, bill.converted_amount) "payed_for": [2],
"amount": "10",
"original_currency": "CAD",
},
)
# Check that the amount is entered as 10CAD and converted to USD.
assert project.get_bills().first().converted_amount == 8.33
# If we switch back to CAD.
project.switch_currency("CAD")
converted = [
(b.amount, b.original_currency, b.converted_amount)
for b in project.get_bills()
]
assert converted == [
(10.0, 'CAD', 10.0),
(13.0, 'EUR', 19.5),
(13.33, 'USD', 16.0),
(20.0, 'USD', 24.0),
(10.0, 'USD', 12.0),
]
class APITestCase(IhatemoneyTestCase): class APITestCase(IhatemoneyTestCase):
@ -3180,7 +3207,7 @@ class HistoryTestCase(IhatemoneyTestCase):
class TestCurrencyConverter(unittest.TestCase): class TestCurrencyConverter(unittest.TestCase):
converter = CurrencyConverter() converter = CurrencyConverter()
mock_data = {"USD": 1, "EUR": 0.8115, "CAD": 1.2699} mock_data = {"USD": 1, "EUR": 0.8, "CAD": 1.2}
converter.get_rates = MagicMock(return_value=mock_data) converter.get_rates = MagicMock(return_value=mock_data)
def test_only_one_instance(self): def test_only_one_instance(self):
@ -3193,7 +3220,7 @@ class TestCurrencyConverter(unittest.TestCase):
def test_exchange_currency(self): def test_exchange_currency(self):
result = self.converter.exchange_currency(100, "USD", "EUR") result = self.converter.exchange_currency(100, "USD", "EUR")
self.assertEqual(result, 81.15) self.assertEqual(result, 80.00)
if __name__ == "__main__": if __name__ == "__main__":