From bff07c10b11a045f0cabcc515f65991b74ac9a01 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 7 Aug 2020 10:31:09 +0100
Subject: [PATCH] Convert IntegerFields to GovukIntegerFields

Changes those fields in the following forms:
- FreeSMSAllowance
- ProviderForm
- ProviderRatioForm
- ServiceDataRetentionEditForm

Includes changes to templates that use this form
and associated tests.
---
 app/main/forms.py                             | 22 ++++++++++---------
 .../views/providers/edit-provider.html        |  2 +-
 .../service-settings/data-retention/add.html  |  2 +-
 .../service-settings/data-retention/edit.html |  2 +-
 .../set-free-sms-allowance.html               |  2 +-
 tests/app/main/views/test_service_settings.py |  3 +--
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 2a8862309..259874135 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1192,7 +1192,7 @@ class NewOrganisationForm(
 
 
 class FreeSMSAllowance(StripWhitespaceForm):
-    free_sms_allowance = IntegerField(
+    free_sms_allowance = GovukIntegerField(
         'Numbers of text message fragments per year',
         validators=[
             DataRequired(message='Cannot be empty')
@@ -1529,7 +1529,9 @@ class EstimateUsageForm(StripWhitespaceForm):
 
 
 class ProviderForm(StripWhitespaceForm):
-    priority = IntegerField('Priority', [validators.NumberRange(min=1, max=100, message="Must be between 1 and 100")])
+    priority = GovukIntegerField(
+        'Priority', [validators.NumberRange(min=1, max=100, message="Must be between 1 and 100")]
+    )
 
 
 class ProviderRatioForm(StripWhitespaceForm):
@@ -2044,17 +2046,17 @@ class ServiceDataRetentionForm(StripWhitespaceForm):
         ],
         validators=[DataRequired()],
     )
-    days_of_retention = IntegerField(label="Days of retention",
-                                     validators=[validators.NumberRange(min=3, max=90,
-                                                                        message="Must be between 3 and 90")],
-                                     )
+    days_of_retention = GovukIntegerField(
+        label="Days of retention",
+        validators=[validators.NumberRange(min=3, max=90, message="Must be between 3 and 90")],
+    )
 
 
 class ServiceDataRetentionEditForm(StripWhitespaceForm):
-    days_of_retention = IntegerField(label="Days of retention",
-                                     validators=[validators.NumberRange(min=3, max=90,
-                                                                        message="Must be between 3 and 90")],
-                                     )
+    days_of_retention = GovukIntegerField(
+        label="Days of retention",
+        validators=[validators.NumberRange(min=3, max=90, message="Must be between 3 and 90")],
+    )
 
 
 class ReturnedLettersForm(StripWhitespaceForm):
diff --git a/app/templates/views/providers/edit-provider.html b/app/templates/views/providers/edit-provider.html
index 5e173f1f1..1fc66748a 100644
--- a/app/templates/views/providers/edit-provider.html
+++ b/app/templates/views/providers/edit-provider.html
@@ -25,7 +25,7 @@ Provider - {{provider.display_name}}
         </ul>
 
         {% call form_wrapper() %}
-            {{ textbox(form.priority) }}
+            {{ form.priority }}
             {{ page_footer('Save') }}
         {% endcall %}
 
diff --git a/app/templates/views/service-settings/data-retention/add.html b/app/templates/views/service-settings/data-retention/add.html
index 179221e89..888e0e4b8 100644
--- a/app/templates/views/service-settings/data-retention/add.html
+++ b/app/templates/views/service-settings/data-retention/add.html
@@ -18,7 +18,7 @@
 
     {% call form_wrapper() %}
       {{ radios(form.notification_type) }}
-      {{ textbox(form.days_of_retention) }}
+      {{ form.days_of_retention }}
       {{ page_footer('Add') }}
     {% endcall %}
 
diff --git a/app/templates/views/service-settings/data-retention/edit.html b/app/templates/views/service-settings/data-retention/edit.html
index f26c95823..7a661ba53 100644
--- a/app/templates/views/service-settings/data-retention/edit.html
+++ b/app/templates/views/service-settings/data-retention/edit.html
@@ -17,7 +17,7 @@
     ) }}
     {% call form_wrapper() %}
       {{ notification_type | capitalize}}
-      {{  textbox(form.days_of_retention) }}
+      {{  form.days_of_retention }}
       {{ page_footer('Save') }}
     {% endcall %}
 
diff --git a/app/templates/views/service-settings/set-free-sms-allowance.html b/app/templates/views/service-settings/set-free-sms-allowance.html
index 92d9afc3b..25a16b7ad 100644
--- a/app/templates/views/service-settings/set-free-sms-allowance.html
+++ b/app/templates/views/service-settings/set-free-sms-allowance.html
@@ -15,7 +15,7 @@
       'Free text message allowance',
       back_link=url_for('.service_settings', service_id=current_service.id)
     ) }}
-    {{ textbox(form.free_sms_allowance) }}
+    {{ form.free_sms_allowance }}
     {{ page_footer('Save') }}
   {% endcall %}
 
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index bce5407e5..bed592afa 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -5087,8 +5087,7 @@ def test_update_service_data_retention_return_validation_error_for_negative_days
     )
     assert response.status_code == 200
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-    error_message = page.find('span', class_='error-message').text.strip()
-    assert error_message == 'Must be between 3 and 90'
+    assert 'Must be between 3 and 90' in page.find('span', class_='govuk-error-message').text
     assert mock_get_service_data_retention.called
     assert not mock_update_service_data_retention.called