From b1d0d216e0bfb055ab7428733777c47ae53281cb Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 26 Jun 2020 17:47:16 +0100
Subject: [PATCH] Convert radios on add org page

Changes OrganisationCrownStatusForm.crown_status.

This also effects NewOrganisationForm, which
inherits from OrganisationCrownStatusForm.

Because of that this commit also updates the
template used for the edit org crown status page,
which uses NewOrganisationForm for its form.
---
 app/main/forms.py                                           | 6 ++----
 app/templates/views/organisations/add-organisation.html     | 5 ++---
 .../organisation/settings/edit-crown-status.html            | 3 +--
 tests/app/main/views/organisations/test_organisation.py     | 6 +++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/main/forms.py b/app/main/forms.py
index 918178907..726195f49 100644
--- a/app/main/forms.py
+++ b/app/main/forms.py
@@ -1168,10 +1168,8 @@ class OrganisationOrganisationTypeForm(StripWhitespaceForm):
 
 
 class OrganisationCrownStatusForm(StripWhitespaceForm):
-    crown_status = RadioField(
-        (
-            'Is this organisation a crown body?'
-        ),
+    crown_status = GovukRadiosField(
+        'Is this organisation a crown body?',
         choices=[
             ('crown', 'Yes'),
             ('non-crown', 'No'),
diff --git a/app/templates/views/organisations/add-organisation.html b/app/templates/views/organisations/add-organisation.html
index 8414df2ba..30c09bd8f 100644
--- a/app/templates/views/organisations/add-organisation.html
+++ b/app/templates/views/organisations/add-organisation.html
@@ -1,7 +1,6 @@
 {% extends "withoutnav_template.html" %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/radios.html" import radios %}
 {% from "components/form.html" import form_wrapper %}
 
 {% block per_page_title %}
@@ -26,8 +25,8 @@
             {{ page_header('New organisation') }}
             {% call form_wrapper() %}
               {{ form.name }}
-              {{ radios(form.organisation_type) }}
-              {{ radios(form.crown_status) }}
+              {{ form.organisation_type }}
+              {{ form.crown_status }}
               {{ page_footer('Save') }}
             {% endcall %}
           {% endblock %}
diff --git a/app/templates/views/organisations/organisation/settings/edit-crown-status.html b/app/templates/views/organisations/organisation/settings/edit-crown-status.html
index 1ab642015..4f325eabf 100644
--- a/app/templates/views/organisations/organisation/settings/edit-crown-status.html
+++ b/app/templates/views/organisations/organisation/settings/edit-crown-status.html
@@ -1,4 +1,3 @@
-{% from "components/radios.html" import radios %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/page-header.html" import page_header %}
 {% from "components/form.html" import form_wrapper %}
@@ -17,7 +16,7 @@
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-five-sixths">
       {% call form_wrapper() %}
-        {{ radios(form.crown_status) }}
+        {{ form.crown_status }}
         {{ page_footer('Save') }}
       {% endcall %}
     </div>
diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py
index 28ee9606c..7d3e12de6 100644
--- a/tests/app/main/views/organisations/test_organisation.py
+++ b/tests/app/main/views/organisations/test_organisation.py
@@ -155,11 +155,11 @@ def test_create_new_organisation_validates(
     )
     assert [
         (error['data-error-label'], normalize_spaces(error.text))
-        for error in page.select('.govuk-error-message, .error-message')
+        for error in page.select('.govuk-error-message')
     ] == [
         ('name', 'Error: Cannot be empty'),
-        ('organisation_type', 'Select the type of organisation'),
-        ('crown_status', 'Select whether this organisation is a crown body'),
+        ('organisation_type', 'Error: Select the type of organisation'),
+        ('crown_status', 'Error: Select whether this organisation is a crown body'),
     ]
     assert mock_create_organisation.called is False