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

2026-08-18 13:39:41 -04:00 · 2023-08-22 12:40:53 -04:00
parent 96d9e009af
commit a4fc40bcba
208 changed files with 153 additions and 152 deletions
--- a/app/templates/components/banner.html
+++ b/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
--- a/app/templates/components/us_components/back-link/README.md
+++ b/app/templates/components/us_components/back-link/README.md
--- a/app/templates/components/us_components/back-link/_back-link.scss
+++ b/app/templates/components/us_components/back-link/_back-link.scss
--- a/app/templates/components/us_components/back-link/macro-options.json
+++ b/app/templates/components/us_components/back-link/macro-options.json
--- a/app/templates/components/us_components/back-link/macro.njk
+++ b/app/templates/components/us_components/back-link/macro.njk
--- a/app/templates/components/us_components/back-link/template.njk
+++ b/app/templates/components/us_components/back-link/template.njk
--- a/app/templates/components/us_components/button/README.md
+++ b/app/templates/components/us_components/button/README.md
--- a/app/templates/components/us_components/button/_button.scss
+++ b/app/templates/components/us_components/button/_button.scss
--- a/app/templates/components/us_components/button/macro-options.json
+++ b/app/templates/components/us_components/button/macro-options.json
--- a/app/templates/components/us_components/button/macro.njk
+++ b/app/templates/components/us_components/button/macro.njk
--- a/app/templates/components/us_components/button/template.njk
+++ b/app/templates/components/us_components/button/template.njk
--- a/app/templates/components/us_components/checkboxes/README.md
+++ b/app/templates/components/us_components/checkboxes/README.md
--- a/app/templates/components/us_components/checkboxes/_checkboxes.scss
+++ b/app/templates/components/us_components/checkboxes/_checkboxes.scss
--- a/app/templates/components/us_components/checkboxes/macro-options.json
+++ b/app/templates/components/us_components/checkboxes/macro-options.json
--- a/app/templates/components/us_components/checkboxes/macro.njk
+++ b/app/templates/components/us_components/checkboxes/macro.njk
--- a/app/templates/components/us_components/checkboxes/template.njk
+++ b/app/templates/components/us_components/checkboxes/template.njk
--- a/app/templates/components/us_components/details/README.md
+++ b/app/templates/components/us_components/details/README.md
--- a/app/templates/components/us_components/details/_details.scss
+++ b/app/templates/components/us_components/details/_details.scss
--- a/app/templates/components/us_components/details/macro-options.json
+++ b/app/templates/components/us_components/details/macro-options.json
--- a/app/templates/components/us_components/details/macro.njk
+++ b/app/templates/components/us_components/details/macro.njk
--- a/app/templates/components/us_components/details/template.njk
+++ b/app/templates/components/us_components/details/template.njk
--- a/app/templates/components/us_components/error-message/README.md
+++ b/app/templates/components/us_components/error-message/README.md
--- a/app/templates/components/us_components/error-message/_error-message.scss
+++ b/app/templates/components/us_components/error-message/_error-message.scss
--- a/app/templates/components/us_components/error-message/macro-options.json
+++ b/app/templates/components/us_components/error-message/macro-options.json
--- a/app/templates/components/us_components/error-message/macro.njk
+++ b/app/templates/components/us_components/error-message/macro.njk
--- a/app/templates/components/us_components/error-message/template.njk
+++ b/app/templates/components/us_components/error-message/template.njk
--- a/app/templates/components/us_components/fieldset/README.md
+++ b/app/templates/components/us_components/fieldset/README.md
--- a/app/templates/components/us_components/fieldset/_fieldset.scss
+++ b/app/templates/components/us_components/fieldset/_fieldset.scss
--- a/app/templates/components/us_components/fieldset/macro-options.json
+++ b/app/templates/components/us_components/fieldset/macro-options.json
--- a/app/templates/components/us_components/fieldset/macro.njk
+++ b/app/templates/components/us_components/fieldset/macro.njk
--- a/app/templates/components/us_components/fieldset/template.njk
+++ b/app/templates/components/us_components/fieldset/template.njk
--- a/app/templates/components/us_components/footer/README.md
+++ b/app/templates/components/us_components/footer/README.md
--- a/app/templates/components/us_components/footer/_footer.scss
+++ b/app/templates/components/us_components/footer/_footer.scss
--- a/app/templates/components/us_components/footer/macro-options.json
+++ b/app/templates/components/us_components/footer/macro-options.json
--- a/app/templates/components/us_components/footer/macro.njk
+++ b/app/templates/components/us_components/footer/macro.njk
--- a/app/templates/components/us_components/footer/template.njk
+++ b/app/templates/components/us_components/footer/template.njk
--- a/app/templates/components/us_components/header/README.md
+++ b/app/templates/components/us_components/header/README.md
--- a/app/templates/components/us_components/header/_header.scss
+++ b/app/templates/components/us_components/header/_header.scss
--- a/app/templates/components/us_components/header/macro-options.json
+++ b/app/templates/components/us_components/header/macro-options.json
--- a/app/templates/components/us_components/header/macro.njk
+++ b/app/templates/components/us_components/header/macro.njk
--- a/app/templates/components/us_components/header/template.njk
+++ b/app/templates/components/us_components/header/template.njk
--- a/app/templates/components/us_components/hint/README.md
+++ b/app/templates/components/us_components/hint/README.md
--- a/app/templates/components/us_components/hint/_hint.scss
+++ b/app/templates/components/us_components/hint/_hint.scss
--- a/app/templates/components/us_components/hint/macro-options.json
+++ b/app/templates/components/us_components/hint/macro-options.json
--- a/app/templates/components/us_components/hint/macro.njk
+++ b/app/templates/components/us_components/hint/macro.njk
--- a/app/templates/components/us_components/hint/template.njk
+++ b/app/templates/components/us_components/hint/template.njk
--- a/app/templates/components/us_components/input/README.md
+++ b/app/templates/components/us_components/input/README.md
--- a/app/templates/components/us_components/input/_input.scss
+++ b/app/templates/components/us_components/input/_input.scss
--- a/app/templates/components/us_components/input/macro-options.json
+++ b/app/templates/components/us_components/input/macro-options.json
--- a/app/templates/components/us_components/input/macro.njk
+++ b/app/templates/components/us_components/input/macro.njk
--- a/app/templates/components/us_components/input/template.njk
+++ b/app/templates/components/us_components/input/template.njk
--- a/app/templates/components/us_components/inset-text/README.md
+++ b/app/templates/components/us_components/inset-text/README.md
--- a/app/templates/components/us_components/inset-text/_inset-text.scss
+++ b/app/templates/components/us_components/inset-text/_inset-text.scss
--- a/app/templates/components/us_components/inset-text/macro-options.json
+++ b/app/templates/components/us_components/inset-text/macro-options.json
--- a/app/templates/components/us_components/inset-text/macro.njk
+++ b/app/templates/components/us_components/inset-text/macro.njk
--- a/app/templates/components/us_components/inset-text/template.njk
+++ b/app/templates/components/us_components/inset-text/template.njk
--- a/app/templates/components/us_components/label/README.md
+++ b/app/templates/components/us_components/label/README.md
--- a/app/templates/components/us_components/label/_label.scss
+++ b/app/templates/components/us_components/label/_label.scss
--- a/app/templates/components/us_components/label/macro-options.json
+++ b/app/templates/components/us_components/label/macro-options.json
--- a/app/templates/components/us_components/label/macro.njk
+++ b/app/templates/components/us_components/label/macro.njk
--- a/app/templates/components/us_components/label/template.njk
+++ b/app/templates/components/us_components/label/template.njk
--- a/app/templates/components/us_components/radio-label/README.md
+++ b/app/templates/components/us_components/radio-label/README.md
--- a/app/templates/components/us_components/radio-label/_label.scss
+++ b/app/templates/components/us_components/radio-label/_label.scss
--- a/app/templates/components/us_components/radio-label/macro-options.json
+++ b/app/templates/components/us_components/radio-label/macro-options.json
--- a/app/templates/components/us_components/radio-label/macro.njk
+++ b/app/templates/components/us_components/radio-label/macro.njk
--- a/app/templates/components/us_components/radio-label/template.njk
+++ b/app/templates/components/us_components/radio-label/template.njk
--- a/app/templates/components/us_components/radios/README.md
+++ b/app/templates/components/us_components/radios/README.md
--- a/app/templates/components/us_components/radios/_radios.scss
+++ b/app/templates/components/us_components/radios/_radios.scss
--- a/app/templates/components/us_components/radios/macro-options.json
+++ b/app/templates/components/us_components/radios/macro-options.json
--- a/app/templates/components/us_components/radios/macro.njk
+++ b/app/templates/components/us_components/radios/macro.njk
--- a/app/templates/components/us_components/radios/template.njk
+++ b/app/templates/components/us_components/radios/template.njk
--- a/app/templates/components/us_components/skip-link/README.md
+++ b/app/templates/components/us_components/skip-link/README.md
--- a/app/templates/components/us_components/skip-link/_skip-link.scss
+++ b/app/templates/components/us_components/skip-link/_skip-link.scss
--- a/app/templates/components/us_components/skip-link/macro-options.json
+++ b/app/templates/components/us_components/skip-link/macro-options.json
--- a/app/templates/components/us_components/skip-link/macro.njk
+++ b/app/templates/components/us_components/skip-link/macro.njk
--- a/app/templates/components/us_components/skip-link/template.njk
+++ b/app/templates/components/us_components/skip-link/template.njk
--- a/app/templates/components/us_components/textarea/README.md
+++ b/app/templates/components/us_components/textarea/README.md
--- a/app/templates/components/us_components/textarea/_textarea.scss
+++ b/app/templates/components/us_components/textarea/_textarea.scss
--- a/app/templates/components/us_components/textarea/macro-options.json
+++ b/app/templates/components/us_components/textarea/macro-options.json
--- a/app/templates/components/us_components/textarea/macro.njk
+++ b/app/templates/components/us_components/textarea/macro.njk
--- a/app/templates/components/us_components/textarea/template.njk
+++ b/app/templates/components/us_components/textarea/template.njk
--- a/app/templates/components/file-upload.html
+++ b/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,
--- a/app/templates/components/list-entry.html
+++ b/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,
--- a/app/templates/components/page-footer.html
+++ b/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,