diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html
index c8314b2e1..8ca33b3fb 100644
--- a/app/templates/components/big-number.html
+++ b/app/templates/components/big-number.html
@@ -34,8 +34,7 @@
link=None,
show_failures=True,
smaller=False,
- smallest=False,
- failed_as_cancelled=False
+ smallest=False
) %}
{% endif %}
diff --git a/app/templates/views/dashboard/_totals.html b/app/templates/views/dashboard/_totals.html
index bb6b01887..a7a9de599 100644
--- a/app/templates/views/dashboard/_totals.html
+++ b/app/templates/views/dashboard/_totals.html
@@ -37,8 +37,7 @@
statistics['letter']['show_warning'],
failure_link=url_for(".view_notifications", service_id=service_id, message_type='letter', status='failed'),
link=url_for(".view_notifications", service_id=service_id, message_type='letter', status=''),
- smaller=smaller_font_size,
- failed_as_cancelled=True
+ smaller=smaller_font_size
) }}
{% endif %}
diff --git a/app/utils.py b/app/utils.py
index 7e20d7680..d77b52f1a 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -40,7 +40,7 @@ from werkzeug.datastructures import MultiDict
SENDING_STATUSES = ['created', 'pending', 'sending', 'pending-virus-check']
DELIVERED_STATUSES = ['delivered', 'sent', 'returned-letter']
FAILURE_STATUSES = ['failed', 'temporary-failure', 'permanent-failure',
- 'technical-failure', 'virus-scan-failed', 'cancelled']
+ 'technical-failure', 'virus-scan-failed']
REQUESTED_STATUSES = SENDING_STATUSES + DELIVERED_STATUSES + FAILURE_STATUSES
diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py
index 3e4fb7e10..929687d31 100644
--- a/tests/app/main/views/test_activity.py
+++ b/tests/app/main/views/test_activity.py
@@ -53,7 +53,7 @@ from tests.conftest import (
'created', 'pending', 'sending', 'pending-virus-check',
'delivered', 'sent', 'returned-letter',
'failed', 'temporary-failure', 'permanent-failure', 'technical-failure',
- 'virus-scan-failed', 'cancelled',
+ 'virus-scan-failed',
]
),
(
@@ -66,7 +66,7 @@ from tests.conftest import (
),
(
'failed',
- ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed', 'cancelled']
+ ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed']
)
]
)
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 22d5ac11a..b7121bed7 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -157,7 +157,7 @@ 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', 'cancelled',
+ 'virus-scan-failed',
]
),
(
@@ -170,7 +170,7 @@ def test_jobs_page_doesnt_show_scheduled_on_page_2(
),
(
'failed',
- ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed', 'cancelled']
+ ['failed', 'temporary-failure', 'permanent-failure', 'technical-failure', 'virus-scan-failed']
)
]
)
@@ -340,7 +340,6 @@ def test_should_show_letter_job(
'permanent-failure',
'technical-failure',
'virus-scan-failed',
- 'cancelled',
],
)
diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py
index b9f3a93de..2e010dbc9 100644
--- a/tests/app/main/views/test_notifications.py
+++ b/tests/app/main/views/test_notifications.py
@@ -202,7 +202,11 @@ def test_notification_page_shows_page_for_letter_notification(
),
(
'validation-failed',
+<<<<<<< HEAD
'Validation failed – content is outside the printable area',
+=======
+ 'Can’t print this letter – content is outside the printable area.',
+>>>>>>> Cancelled notifications do not show as failures on dashboard stats
),
))
@freeze_time("2016-01-01 01:01")