From 63f704c64f92e151bbaa114da18f83c04643b2a4 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 27 Feb 2020 17:51:01 +0000 Subject: [PATCH] Fix accidental switch of previous and next We were showing the previous page link when we meant to show the next page link because the variables were swapped round in the code. --- app/main/views/uploads.py | 4 ++-- tests/app/main/views/test_uploads.py | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/main/views/uploads.py b/app/main/views/uploads.py index 961b1ae80..a6b32f28d 100644 --- a/app/main/views/uploads.py +++ b/app/main/views/uploads.py @@ -46,10 +46,10 @@ def uploads(service_id): uploads = current_service.get_page_of_uploads(page=request.args.get('page')) prev_page = None - if uploads.next_page: + if uploads.prev_page: prev_page = generate_previous_dict('main.uploads', service_id, uploads.current_page) next_page = None - if uploads.prev_page: + if uploads.next_page: next_page = generate_next_dict('main.uploads', service_id, uploads.current_page) if uploads.current_page == 1: diff --git a/tests/app/main/views/test_uploads.py b/tests/app/main/views/test_uploads.py index 561482436..c9cf333ed 100644 --- a/tests/app/main/views/test_uploads.py +++ b/tests/app/main/views/test_uploads.py @@ -660,3 +660,21 @@ def test_uploads_page_shows_scheduled_jobs( ), ] assert not page.select('.table-empty-message') + + +def test_get_uploads_shows_pagination( + client_request, + active_user_with_permissions, + mock_get_jobs, + mock_get_uploads, +): + page = client_request.get('main.uploads', service_id=SERVICE_ONE_ID) + + assert normalize_spaces(page.select_one('.next-page').text) == ( + 'Next page ' + 'page 2' + ) + assert normalize_spaces(page.select_one('.previous-page').text) == ( + 'Previous page ' + 'page 0' + )