Display cancelled letters show as failed

In the long term, we don't want to show cancelled letters. But for now,
this changes cancelled letters to display in the same way that letters
with a status of permanent-failure, since we are currently giving
letters that we want to cancel the status of permanent failure.

tests/app/main/views/test_activity.py

@@ -52,7 +52,8 @@ from tests.conftest import (
             [
                 'created', 'pending', 'sending', 'pending-virus-check',
                 'delivered', 'sent', 'returned-letter',
-                'failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed',
+                'failed', 'temporary-failure', 'permanent-failure', 'technical-failure',
+                'virus-scan-failed', 'cancelled',
             ]
         ),
         (
@@ -65,7 +66,7 @@ from tests.conftest import (
         ),
         (
             'failed',
-            ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed']
+            ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed', 'cancelled']
         )
     ]
 )

tests/app/main/views/test_jobs.py

@@ -156,7 +156,8 @@ def test_jobs_page_doesnt_show_scheduled_on_page_2(
             [
                 'created', 'pending', 'sending', 'pending-virus-check',
                 'delivered', 'sent', 'returned-letter',
-                'failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed',
+                'failed', 'temporary-failure', 'permanent-failure', 'technical-failure',
+                'virus-scan-failed', 'cancelled',
             ]
         ),
         (
@@ -169,7 +170,7 @@ def test_jobs_page_doesnt_show_scheduled_on_page_2(
         ),
         (
             'failed',
-            ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed']
+            ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed', 'cancelled']
         )
     ]
 )
@@ -339,6 +340,7 @@ def test_should_show_letter_job(
             'permanent-failure',
             'technical-failure',
             'virus-scan-failed',
+            'cancelled',
         ],
     )
 

tests/app/main/views/test_notifications.py

@@ -195,6 +195,10 @@ def test_notification_page_shows_page_for_letter_notification(
         'permanent-failure',
         'Cancelled 1 January at 1:02am',
     ),
+    (
+        'cancelled',
+        'Cancelled 1 January at 1:02am',
+    ),
     (
         'validation-failed',
         'Cancelled 1 January at 1:02am (letter has content outside the printable area)',