From 7aad059d3d817da646762d21540beaeafc082836 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Fri, 19 Sep 2025 17:55:41 +1000 Subject: [PATCH] Change from "$xx" to "xx USD" to fix tests --- tests/data/templates.ini | 2 +- tests/data/test_main.ini | 2 +- tests/data/test_main_fees_import.ledger | 16 ++++++++-------- tests/test_hook_ledger_entry.py | 20 +++++++++----------- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/tests/data/templates.ini b/tests/data/templates.ini index dc75538..938cf56 100644 --- a/tests/data/templates.ini +++ b/tests/data/templates.ini @@ -1,6 +1,6 @@ [DEFAULT] date_format = %%Y-%%m-%%d -signed_currencies = USD, CAD +signed_currencies = CAD signed_currency_format = ¤#,##0.### unsigned_currency_format = #,##0.### ¤¤ diff --git a/tests/data/test_main.ini b/tests/data/test_main.ini index 1d4dfb2..9539a65 100644 --- a/tests/data/test_main.ini +++ b/tests/data/test_main.ini @@ -1,7 +1,7 @@ [DEFAULT] default_date = 2016/04/04 loglevel = critical -signed_currencies = USD +signed_currencies = [One] patreon cardfees ledger entry = diff --git a/tests/data/test_main_fees_import.ledger b/tests/data/test_main_fees_import.ledger index a2ec9b4..d767231 100644 --- a/tests/data/test_main_fees_import.ledger +++ b/tests/data/test_main_fees_import.ledger @@ -1,19 +1,19 @@ 2017/09/01 Patreon - Accrued:Accounts Receivable $-52.47 - Expenses:Fees:Credit Card $52.47 + Accrued:Accounts Receivable -52.47 USD + Expenses:Fees:Credit Card 52.47 USD 2017/10/01 Patreon - Accrued:Accounts Receivable $-99.47 - Expenses:Fees:Credit Card $99.47 + Accrued:Accounts Receivable -99.47 USD + Expenses:Fees:Credit Card 99.47 USD 2017/09/01 Patreon ;SourcePath: {source_abspath} ;SourceName: {source_name} - Accrued:Accounts Receivable $-61.73 - Expenses:Fundraising $61.73 + Accrued:Accounts Receivable -61.73 USD + Expenses:Fundraising 61.73 USD 2017/10/01 Patreon ;SourcePath: {source_abspath} ;SourceName: {source_name} - Accrued:Accounts Receivable $-117.03 - Expenses:Fundraising $117.03 + Accrued:Accounts Receivable -117.03 USD + Expenses:Fundraising 117.03 USD diff --git a/tests/test_hook_ledger_entry.py b/tests/test_hook_ledger_entry.py index 4b07ae8..f4cdbc1 100644 --- a/tests/test_hook_ledger_entry.py +++ b/tests/test_hook_ledger_entry.py @@ -60,7 +60,7 @@ def test_date_formatting(): def test_currency_formatting(): tmpl = template_from('Simplest', signed_currencies=['USD']) - assert_easy_render(tmpl, 'CC', '7.99', 'USD', '2015/03/14', '$7.99') + assert_easy_render(tmpl, 'CC', '7.99', 'USD', '2015/03/14', 'USD7.99') def test_empty_template(): tmpl = ledger_entry.Template("\n \n") @@ -76,19 +76,18 @@ def test_complex_template(): lines = render_lines( render_vars, 'Complex', date_fmt='%Y-%m-%d', - signed_currencies=['USD'], ) assert lines == [ "", "2015-03-14 TT", " ;Tag: Value", " ;TransactionID: ABCDEF", - " Accrued:Accounts Receivable $125.50", + " Accrued:Accounts Receivable 125.50 USD", " ;Entity: Supplier", - " Income:Donations:Spectrum Defense $-119.85", + " Income:Donations:Spectrum Defense -119.85 USD", " ;Program: Spectrum Defense", " ;Entity: T-T", - " Income:Donations:General $-5.65", + " Income:Donations:General -5.65 USD", " ;Entity: T-T", ] @@ -108,19 +107,18 @@ def test_variable_whitespace_cleaned(): lines = render_lines( render_vars, 'Complex', date_fmt='%Y-%m-%d', - signed_currencies=['USD'], ) assert lines == [ "", "2015-03-14 W S", " ;Tag: Value", " ;TransactionID: ABC DEF", - " Accrued:Accounts Receivable $125.50", + " Accrued:Accounts Receivable 125.50 USD", " ;Entity: Supplier", - " Income:Donations:Spectrum Defense $-119.85", + " Income:Donations:Spectrum Defense -119.85 USD", " ;Program: Spectrum Defense", " ;Entity: W S", - " Income:Donations:General $-5.65", + " Income:Donations:General -5.65 USD", " ;Entity: W S", ] @@ -342,8 +340,8 @@ def test_hook_renders_template(): assert lines == [ "", "2015-03-14 BB", - " Accrued:Accounts Receivable $0.99", - " Income:Donations -$0.99", + " Accrued:Accounts Receivable 0.99 USD", + " Income:Donations -0.99 USD", ] def test_hook_handles_empty_template():