Refactor tests

This commit is contained in:
Imdad Ahad
2017-04-21 11:07:45 +01:00
parent 4dfd5448ad
commit 49fb4823e3
4 changed files with 34 additions and 51 deletions

View File

@@ -69,7 +69,7 @@ def get_all_notifications_for_service_job(service_id, job_id):
data = notifications_filter_schema.load(request.args).data
page = data['page'] if 'page' in data else 1
page_size = data['page_size'] if 'page_size' in data else current_app.config.get('PAGE_SIZE')
pagination = get_notifications_for_job(
paginated_notifications = get_notifications_for_job(
service_id,
job_id,
filter_dict=data,
@@ -82,16 +82,16 @@ def get_all_notifications_for_service_job(service_id, job_id):
notifications = None
if data.get('format_for_csv'):
notifications = [notification.serialize_for_csv() for notification in pagination.items]
notifications = [notification.serialize_for_csv() for notification in paginated_notifications.items]
else:
notifications = notification_with_template_schema.dump(pagination.items, many=True).data
notifications = notification_with_template_schema.dump(paginated_notifications.items, many=True).data
return jsonify(
notifications=notifications,
page_size=page_size,
total=pagination.total,
total=paginated_notifications.total,
links=pagination_links(
pagination,
paginated_notifications,
'.get_all_notifications_for_service_job',
**kwargs
)