darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-27 11:19:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into inbound_number_admin

Browse Source
This commit is contained in:
Rebecca Law
2017-08-21 13:50:49 +01:00
parent 6b04373bcf 786af4e046
commit 8cf29a7d04
10 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/conftest.py
View File

@@ -1505,7 +1505,7 @@ def mock_get_usage(mocker, service_one, fake_uuid):
]
return mocker.patch(
'app.service_api_client.get_service_usage', side_effect=_get_usage)
'app.billing_api_client.get_service_usage', side_effect=_get_usage)
@pytest.fixture(scope='function')
@@ -1605,7 +1605,7 @@ def mock_get_billable_units(mocker):
]
return mocker.patch(
'app.service_api_client.get_billable_units', side_effect=_get_usage)
'app.billing_api_client.get_billable_units', side_effect=_get_usage)
@pytest.fixture(scope='function')
@@ -1623,7 +1623,7 @@ def mock_get_future_usage(mocker, service_one, fake_uuid):
]
return mocker.patch(
'app.service_api_client.get_service_usage', side_effect=_get_usage)
'app.billing_api_client.get_service_usage', side_effect=_get_usage)
@pytest.fixture(scope='function')
@@ -1632,7 +1632,7 @@ def mock_get_future_billable_units(mocker):
return []
return mocker.patch(
'app.service_api_client.get_billable_units', side_effect=_get_usage)
'app.billing_api_client.get_billable_units', side_effect=_get_usage)
@pytest.fixture(scope='function')