Renamed components folder, put failing tests back in to get some assistance with those

app/main/forms.py

@@ -256,7 +256,7 @@ def govuk_text_input_field_widget(self, field, type=None, param_extensions=None,
     merge_jsonlike(params, param_extensions)
 
     return Markup(
-        render_template('components/us_components/input/template.njk', params=params))
+        render_template('components/components/input/template.njk', params=params))
 
 
 class GovukTextInputField(StringField):
@@ -790,7 +790,7 @@ def govuk_radios_field_widget(self, field, param_extensions=None, **kwargs):
         merge_jsonlike(params, param_extensions)
 
     return Markup(
-        render_template('components/us_components/radios/template.njk', params=params))
+        render_template('components/components/radios/template.njk', params=params))
 
 
 class GovukCheckboxField(BooleanField):
@@ -847,7 +847,7 @@ class GovukTextareaField(TextAreaField):
             merge_jsonlike(params, param_extensions)
 
         return Markup(
-            render_template('components/us_components/textarea/template.njk', params=params))
+            render_template('components/components/textarea/template.njk', params=params))
 
 
 # based on work done by @richardjpope: https://github.com/richardjpope/recourse/blob/master/recourse/forms.py#L6

app/templates/components/banner.html

@@ -1,5 +1,5 @@
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None, thing=None) %}
   <div

app/templates/components/file-upload.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro file_upload(
   field,

app/templates/components/list-entry.html

@@ -1,5 +1,5 @@
-{% from "components/us_components/fieldset/macro.njk" import govukFieldset %}
-{% from "components/us_components/error-message/macro.njk" import govukErrorMessage %}
+{% from "components/components/fieldset/macro.njk" import govukFieldset %}
+{% from "components/components/error-message/macro.njk" import govukErrorMessage %}
 
 {% macro list_entry(
   field,

app/templates/components/page-footer.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/button/macro.njk" import govukButton %}
+{% from "components/components/button/macro.njk" import govukButton %}
 
 {% macro page_footer(
   button_text=None,

app/templates/forms/fields/checkboxes/template.njk

@@ -1,7 +1,7 @@
-{% from "components/us_components/error-message/macro.njk" import govukErrorMessage -%}
-{% from "components/us_components/fieldset/macro.njk" import govukFieldset %}
-{% from "components/us_components/hint/macro.njk" import govukHint %}
-{% from "components/us_components/radio-label/macro.njk" import usaRadioLabel %}
+{% from "components/components/error-message/macro.njk" import govukErrorMessage -%}
+{% from "components/components/fieldset/macro.njk" import govukFieldset %}
+{% from "components/components/hint/macro.njk" import govukHint %}
+{% from "components/components/radio-label/macro.njk" import usaRadioLabel %}
 
 
 {#- Copied from https://github.com/alphagov/govuk-frontend/blob/v2.13.0/src/components/checkboxes/template.njk

app/templates/main_template.html

@@ -1,6 +1,6 @@
-{% from "./components/us_components/skip-link/macro.njk" import govukSkipLink -%}
-{% from "./components/us_components/header/macro.njk" import govukHeader -%}
-{% from "./components/us_components/footer/macro.njk" import govukFooter -%}
+{% from "./components/components/skip-link/macro.njk" import govukSkipLink -%}
+{% from "./components/components/header/macro.njk" import govukHeader -%}
+{% from "./components/components/footer/macro.njk" import govukFooter -%}
 {# specify absolute url for the static assets folder e.g. http://wwww.domain.com/assets #}
 {%- set assetUrl = assetUrl | default(assetPath) -%}
 <!DOCTYPE html>

app/templates/partials/templates/guidance-formatting-letters.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="heading-medium">Formatting</h2>
 <p class="govuk-body">

app/templates/partials/templates/guidance-formatting.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="heading-medium">Formatting</h2>
 <p class="bottom-gutter-1-3">

app/templates/partials/templates/guidance-links.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="font-body-lg">Links and URLs</h2>
 <p class="bottom-gutter-1-3">

app/templates/partials/templates/guidance-optional-content.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="font-body-lg">
   Optional content

app/templates/partials/templates/guidance-personalisation.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="font-body-lg">
   Personalization

app/templates/partials/templates/guidance-send-a-document.html

@@ -1,4 +1,4 @@
-{% from "components/us_components/inset-text/macro.njk" import govukInsetText %}
+{% from "components/components/inset-text/macro.njk" import govukInsetText %}
 
 <h2 class="heading-medium">
   Send a document by email

app/templates/views/api/callbacks.html

@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/table.html" import mapping_table, row, text_field, edit_field, optional_text_field with context %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks

app/templates/views/api/callbacks/delivery-status-callback.html

@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks for delivery receipts

app/templates/views/api/callbacks/received-text-messages-callback.html

@@ -2,7 +2,7 @@
 {% from "components/page-header.html" import page_header %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Callbacks for received text messages

app/templates/views/api/guest-list.html

@@ -5,7 +5,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/list-entry.html" import list_entry %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Guest list

app/templates/views/api/keys.html

@@ -1,8 +1,8 @@
 {% extends "withnav_template.html" %}
 {% from "components/table.html" import list_table, field, hidden_field_heading %}
 {% from "components/page-header.html" import page_header %}
-{% from "components/us_components/button/macro.njk" import govukButton %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/button/macro.njk" import govukButton %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   API keys

app/templates/views/api/keys/create.html

@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/form.html" import form_wrapper %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Create an API key

app/templates/views/check/column-errors.html

@@ -3,7 +3,7 @@
 {% from "components/radios.html" import radio_select %}
 {% from "components/table.html" import list_table, field, text_field, index_field, hidden_field_heading %}
 {% from "components/file-upload.html" import file_upload %}
-{% from "components/us_components/back-link/macro.njk" import govukBackLink %}
+{% from "components/components/back-link/macro.njk" import govukBackLink %}
 
 {% block service_page_title %}
   Error