Added test for template stats client.

Removed date column from recently used templates table.
This commit is contained in:
Adam Shimali
2016-04-05 13:49:22 +01:00
parent 159fe60c1a
commit eade0ef971
4 changed files with 25 additions and 30 deletions

View File

@@ -3,7 +3,7 @@
template_statistics, template_statistics,
caption="Recent templates used", caption="Recent templates used",
empty_message='You havent sent any batch messages yet', empty_message='You havent sent any batch messages yet',
field_headings=['Template', 'Type','Date', right_aligned_field_heading('Usage')] field_headings=['Template', 'Type', right_aligned_field_heading('Usage')]
) %} ) %}
{% call field() %} {% call field() %}
<a href="{{ url_for('.edit_service_template', service_id=service_id, template_id=item.template.id) }}"> <a href="{{ url_for('.edit_service_template', service_id=service_id, template_id=item.template.id) }}">
@@ -12,9 +12,6 @@
{% endcall %} {% endcall %}
{% call field() %} {% call field() %}
{{item.template.template_type}} {{item.template.template_type}}
{% endcall %}
{% call field() %}
{{ item.day|format_date }}
{% endcall %} {% endcall %}
{% call field(align='right') %} {% call field(align='right') %}
{{ item.usage_count }} {{ item.usage_count }}

View File

@@ -1,23 +0,0 @@
{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
{% call(item) list_table(
template_statistics,
caption="Recent templates used",
empty_message='You havent sent any batch messages yet',
field_headings=['Template', 'Type','Date', right_aligned_field_heading('Usage')]
) %}
{% call field() %}
<a href="{{ url_for('.edit_service_template', service_id=service_id, template_id=item.template.id) }}">
{{ item.template.name }}
</a>
{% endcall %}
{% call field() %}
{{item.template.template_type}}
{% endcall %}
{% call field() %}
{{ item.day|format_date }}
{% endcall %}
{% call field(align='right') %}
{{ item.usage_count }}
{% endcall %}
{% endcall %}

View File

@@ -1,13 +1,17 @@
import uuid
from app.notify_client.statistics_api_client import StatisticsApiClient from app.notify_client.statistics_api_client import StatisticsApiClient
def test_client_uses_correct_find_by_email(mocker, api_user_active): def test_notifications_statistics_client_calls_correct_api_endpoint(mocker, api_user_active):
expected_url = '/service/a1b2c3d4/notifications-statistics' some_service_id = uuid.uuid4()
expected_url = '/service/{}/notifications-statistics'.format(some_service_id)
client = StatisticsApiClient() client = StatisticsApiClient()
mock_get = mocker.patch('app.notify_client.statistics_api_client.StatisticsApiClient.get') mock_get = mocker.patch('app.notify_client.statistics_api_client.StatisticsApiClient.get')
client.get_statistics_for_service('a1b2c3d4') client.get_statistics_for_service(some_service_id)
mock_get.assert_called_once_with(url=expected_url) mock_get.assert_called_once_with(url=expected_url)

View File

@@ -0,0 +1,17 @@
import uuid
from app.notify_client.template_statistics_api_client import TemplateStatisticsApiClient
def test_template_statistics_client_calls_correct_api_endpoint(mocker, api_user_active):
some_service_id = uuid.uuid4()
expected_url = '/service/{}/template-statistics'.format(some_service_id)
client = TemplateStatisticsApiClient()
mock_get = mocker.patch('app.notify_client.template_statistics_api_client.TemplateStatisticsApiClient.get')
client.get_template_statistics_for_service(some_service_id)
mock_get.assert_called_once_with(url=expected_url)