From 9d061e6966c2c05e59674e5a7ded31afc5f503d8 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Tue, 31 May 2022 17:27:38 +0100 Subject: [PATCH] remove rate from tests now that we have removed it --- tests/app/dao/test_fact_billing_dao.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/app/dao/test_fact_billing_dao.py b/tests/app/dao/test_fact_billing_dao.py index 32ac799af..917525572 100644 --- a/tests/app/dao/test_fact_billing_dao.py +++ b/tests/app/dao/test_fact_billing_dao.py @@ -654,7 +654,6 @@ def test_fetch_sms_billing_for_all_services_for_first_quarter(notify_db_session) assert results[0].free_sms_fragment_limit == 25000 assert results[0].sms_remainder == 24956 assert results[0].sms_cost == 0 - assert results[0].sms_rate == 0.11 def test_fetch_sms_billing_for_all_services_with_remainder(notify_db_session): @@ -699,21 +698,21 @@ def test_fetch_sms_billing_for_all_services_with_remainder(notify_db_session): # the requested report's start date. { "organisation_name": org.name, "organisation_id": org.id, "service_name": service_1.name, - "service_id": service_1.id, "free_sms_fragment_limit": 10, "sms_rate": Decimal('0.11'), "sms_remainder": 5, + "service_id": service_1.id, "free_sms_fragment_limit": 10, "sms_remainder": 5, "sms_billable_units": 3, "chargeable_billable_sms": 0, "sms_cost": Decimal('0.00') }, # sms remainder is 0, because this service sent SMS worth 15 billable units, 12 of which were sent # before requested report's start date { "organisation_name": org_2.name, "organisation_id": org_2.id, "service_name": service_2.name, - "service_id": service_2.id, "free_sms_fragment_limit": 10, "sms_rate": Decimal('0.11'), "sms_remainder": 0, + "service_id": service_2.id, "free_sms_fragment_limit": 10, "sms_remainder": 0, "sms_billable_units": 3, "chargeable_billable_sms": 3, "sms_cost": Decimal('0.33') }, # sms remainder is 0, because this service sent SMS worth 12 billable units, 5 of which were sent # before requested report's start date { "organisation_name": org_3.name, "organisation_id": org_3.id, "service_name": service_3.name, - "service_id": service_3.id, "free_sms_fragment_limit": 10, "sms_rate": Decimal('0.11'), "sms_remainder": 0, + "service_id": service_3.id, "free_sms_fragment_limit": 10, "sms_remainder": 0, "sms_billable_units": 7, "chargeable_billable_sms": 2, "sms_cost": Decimal('0.22') }, ] @@ -733,7 +732,7 @@ def test_fetch_sms_billing_for_all_services_without_an_organisation_appears(noti "organisation_name": fixtures["org_1"].name, "organisation_id": fixtures["org_1"].id, "service_name": fixtures["service_1_sms_and_letter"].name, "service_id": fixtures["service_1_sms_and_letter"].id, - "free_sms_fragment_limit": 10, "sms_rate": Decimal('0.11'), "sms_remainder": 5, + "free_sms_fragment_limit": 10, "sms_remainder": 5, "sms_billable_units": 3, "chargeable_billable_sms": 0, "sms_cost": Decimal('0.00') }, # sms remainder is 0, because this service sent SMS worth 15 billable units, 12 of which were sent @@ -742,14 +741,14 @@ def test_fetch_sms_billing_for_all_services_without_an_organisation_appears(noti "organisation_name": None, "organisation_id": None, "service_name": fixtures["service_with_sms_without_org"].name, "service_id": fixtures["service_with_sms_without_org"].id, "free_sms_fragment_limit": 10, - "sms_rate": Decimal('0.11'), "sms_remainder": 0, + "sms_remainder": 0, "sms_billable_units": 3, "chargeable_billable_sms": 3, "sms_cost": Decimal('0.33') }, { "organisation_name": None, "organisation_id": None, "service_name": fixtures["service_with_sms_within_allowance"].name, "service_id": fixtures["service_with_sms_within_allowance"].id, "free_sms_fragment_limit": 10, - "sms_rate": Decimal('0.11'), "sms_remainder": 8, + "sms_remainder": 8, "sms_billable_units": 2, "chargeable_billable_sms": 0, "sms_cost": Decimal('0.00') }, ]