Rewrite prev/next test to use BeautifulSoup

app/main/views/jobs.py

@@ -172,7 +172,7 @@ def view_notifications(service_id, message_type):
         limit_days=current_app.config['ACTIVITY_STATS_LIMIT_DAYS'])
     view_dict = dict(
         message_type=message_type,
-        status=filter_args['status']
+        status=request.args.get('status')
     )
     prev_page = None
     if notifications['links'].get('prev', None):

tests/app/main/views/test_jobs.py

@@ -295,10 +295,21 @@ def test_should_show_notifications_for_a_service_with_next_previous(
             ))
         assert response.status_code == 200
         content = response.get_data(as_text=True)
-        assert url_for('main.view_notifications', service_id=service_one['id'], message_type='sms', page=3) in content
+        page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-        assert url_for('main.view_notifications', service_id=service_one['id'], message_type='sms', page=1) in content
+        next_page_link = page.find('a', {'rel': 'next'})
-        assert 'Previous page' in content
+        prev_page_link = page.find('a', {'rel': 'previous'})
-        assert 'Next page' in content
+        assert (
+            url_for('main.view_notifications', service_id=service_one['id'], message_type='sms', page=3) in
+            next_page_link['href']
+        )
+        assert 'Next page' in next_page_link.text.strip()
+        assert 'page 3' in next_page_link.text.strip()
+        assert (
+            url_for('main.view_notifications', service_id=service_one['id'], message_type='sms', page=1) in
+            prev_page_link['href']
+        )
+        assert 'Previous page' in prev_page_link.text.strip()
+        assert 'page 1' in prev_page_link.text.strip()
 
 
 @freeze_time("2016-01-01 11:09:00.061258")