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

@@ -1168,10 +1168,8 @@ class OrganisationOrganisationTypeForm(StripWhitespaceForm):
 
 
 class OrganisationCrownStatusForm(StripWhitespaceForm):
-    crown_status = RadioField(
+    crown_status = GovukRadiosField(
-        (
+        'Is this organisation a crown body?',
-            'Is this organisation a crown body?'
-        ),
         choices=[
             ('crown', 'Yes'),
             ('non-crown', 'No'),

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) }}
+              {{ form.organisation_type }}
-              {{ radios(form.crown_status) }}
+              {{ form.crown_status }}
               {{ page_footer('Save') }}
             {% endcall %}
           {% endblock %}

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>

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'),
+        ('organisation_type', 'Error: Select the type of organisation'),
-        ('crown_status', 'Select whether this organisation is a crown body'),
+        ('crown_status', 'Error: Select whether this organisation is a crown body'),
     ]
     assert mock_create_organisation.called is False