From d9f5884e3d870ee8aa7249ded7aa57d87b070c07 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 16 May 2017 11:43:19 +0100 Subject: [PATCH] Fix argument order bug with page count --- app/template_previews.py | 2 +- tests/app/test_template_previews.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/template_previews.py b/app/template_previews.py index 9ff71f682..a3f5970e8 100644 --- a/app/template_previews.py +++ b/app/template_previews.py @@ -39,7 +39,7 @@ def get_page_count_for_letter(template, values=None): if template['template_type'] != 'letter': return None - page_count, _, _ = TemplatePreview.from_database_object(template, values, filetype='json') + page_count, _, _ = TemplatePreview.from_database_object(template, 'json', values) page_count = json.loads(page_count.decode('utf-8'))['count'] return page_count diff --git a/tests/app/test_template_previews.py b/tests/app/test_template_previews.py index 7af5b90e8..8c8200576 100644 --- a/tests/app/test_template_previews.py +++ b/tests/app/test_template_previews.py @@ -77,11 +77,11 @@ def test_page_count_returns_none_for_non_letter_templates(template_type): @pytest.mark.parametrize('partial_call, expected_template_preview_args', [ ( partial(get_page_count_for_letter), - ({'template_type': 'letter'}, None) + ({'template_type': 'letter'}, 'json', None) ), ( partial(get_page_count_for_letter, values={'foo': 'bar'}), - ({'template_type': 'letter'}, {'foo': 'bar'}) + ({'template_type': 'letter'}, 'json', {'foo': 'bar'}) ), ]) def test_page_count_unpacks_from_json_response( @@ -93,4 +93,4 @@ def test_page_count_unpacks_from_json_response( mock_template_preview.return_value = (b'{"count": 99}', 200, {}) assert partial_call({'template_type': 'letter'}) == 99 - mock_template_preview.assert_called_once_with(*expected_template_preview_args, filetype='json') + mock_template_preview.assert_called_once_with(*expected_template_preview_args)