Merge branch 'more-rows-wording'

app/main/views/send.py

@@ -227,8 +227,8 @@ def check_messages(service_id, template_type, upload_id):
         contents,
         template_type=template.template_type,
         placeholders=template.placeholders,
-        max_initial_rows_shown=15,
-        max_errors_shown=15,
+        max_initial_rows_shown=50,
+        max_errors_shown=50,
         whitelist=itertools.chain.from_iterable(
             [user.mobile_number, user.email_address] for user in users
         ) if current_service['restricted'] else None

app/templates/views/check.html

@@ -97,7 +97,15 @@
 
   {% if count_of_displayed_recipients < count_of_recipients %}
     <p class="table-show-more-link">
-      {{ count_of_recipients - count_of_displayed_recipients }} {{ "row" if 1 == (count_of_recipients - count_of_displayed_recipients) else "rows"}} not shown
+      {% if rows_have_errors %}
+        Only showing the first {{ count_of_displayed_recipients }} rows with errors
+      {% else %}
+        Only showing the first {{ count_of_displayed_recipients }} rows
+      {% endif %}
+    </p>
+  {% elif rows_have_errors %}
+    <p class="table-show-more-link">
+      Only showing rows with errors
     </p>
   {% endif %}
 

tests/app/main/views/test_send.py

@@ -157,27 +157,9 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers(
 
     mocker.patch(
         'app.main.views.send.s3download',
-        return_value="""
-            phone number
-            07700 900701
-            07700 900702
-            07700 900703
-            07700 900704
-            07700 900705
-            07700 900706
-            07700 900707
-            07700 900708
-            07700 900709
-            07700 900710
-            07700 900711
-            07700 900712
-            07700 900713
-            07700 900714
-            07700 900715
-            07700 900799
-            07700 900799
-            07700 900799
-        """
+        return_value='\n'.join(['phone number'] + [
+            '07700 9007{0:02d}'.format(final_two) for final_two in range(0, 53)
+        ])
     )
 
     with app_.test_request_context():
@@ -192,14 +174,14 @@ def test_upload_csvfile_with_valid_phone_shows_all_numbers(
             with client.session_transaction() as sess:
                 assert int(sess['upload_data']['template_id']) == 54321
                 assert sess['upload_data']['original_file_name'] == 'valid.csv'
-                assert sess['upload_data']['notification_count'] == 18
+                assert sess['upload_data']['notification_count'] == 53
 
             content = response.get_data(as_text=True)
             assert response.status_code == 200
             assert '07700 900701' in content
-            assert '07700 900715' in content
-            assert '07700 900716' not in content
-            assert '3 rows not shown' in content
+            assert '07700 900749' in content
+            assert '07700 900750' not in content
+            assert 'Only showing the first 50 rows with errors' in content
 
 
 def test_create_job_should_call_api(