Merge pull request #1662 from alphagov/rc-update-template-usage-to-use-new-end-point

Disabled the template_history endpoint
This commit is contained in:
Richard Chapman
2017-11-27 09:39:07 +00:00
committed by GitHub
5 changed files with 35 additions and 56 deletions

View File

@@ -359,17 +359,33 @@ def test_should_show_recent_templates_on_dashboard(
partial(url_for),
partial(url_for, year='2016'),
])
def test_should_show_monthly_breakdown_of_template_usage(
logged_in_client,
mock_get_monthly_template_statistics,
partial_url,
def test_should_show_redirect_from_template_history(
logged_in_client,
partial_url,
):
response = logged_in_client.get(
partial_url('main.template_history', service_id=SERVICE_ONE_ID, _external=True)
)
assert response.status_code == 301
@freeze_time("2016-07-01 12:00") # 4 months into 2016 financial year
@pytest.mark.parametrize('partial_url', [
partial(url_for),
partial(url_for, year='2016'),
])
def test_should_show_monthly_breakdown_of_template_usage(
logged_in_client,
mock_get_monthly_template_usage,
partial_url,
):
response = logged_in_client.get(
partial_url('main.template_usage', service_id=SERVICE_ONE_ID, _external=True)
)
assert response.status_code == 200
mock_get_monthly_template_statistics.assert_called_once_with(SERVICE_ONE_ID, 2016)
mock_get_monthly_template_usage.assert_called_once_with(SERVICE_ONE_ID, 2016)
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
table_rows = page.select('tbody tr')

View File

@@ -2001,22 +2001,18 @@ def mock_get_template_statistics(mocker, service_one, fake_uuid):
@pytest.fixture(scope='function')
def mock_get_monthly_template_statistics(mocker, service_one, fake_uuid):
def mock_get_monthly_template_usage(mocker, service_one, fake_uuid):
def _stats(service_id, year):
return {
datetime.utcnow().strftime('%Y-%m'): {
fake_uuid: {
"counts": {
"sending": 1,
"delivered": 1,
},
"name": 'My first template',
"type": 'sms',
}
}
}
return [{
"template_id": fake_uuid,
"month": 4,
"year": year,
"count": 2,
"name": 'My first template',
"type": 'sms'
}]
return mocker.patch(
'app.template_statistics_client.get_monthly_template_statistics_for_service',
'app.template_statistics_client.get_monthly_template_usage_for_service',
side_effect=_stats
)