Fix failing tests by using relative imports

Also removing a random import from the warning text component where it tries to import itself.
alphagov · May 31, 2018 · a57c784 · a57c784
1 parent 420f674
commit a57c784
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 27 deletions.
diff --git a/src/components/checkboxes/template.njk b/src/components/checkboxes/template.njk
@@ -1,7 +1,7 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "fieldset/macro.njk" import govukFieldset %}
-{% from "hint/macro.njk" import govukHint %}
-{% from "label/macro.njk" import govukLabel %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../fieldset/macro.njk" import govukFieldset %}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../label/macro.njk" import govukLabel %}
 
 {#- If an id 'prefix' is not passed, fall back to using the name attribute
    instead. We need this for error messages and hints as well -#}

diff --git a/src/components/date-input/template.njk b/src/components/date-input/template.njk
@@ -1,7 +1,7 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "fieldset/macro.njk" import govukFieldset %}
-{% from "hint/macro.njk" import govukHint %}
-{% from "input/macro.njk" import govukInput %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../fieldset/macro.njk" import govukFieldset %}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../input/macro.njk" import govukInput %}
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}

diff --git a/src/components/file-upload/template.njk b/src/components/file-upload/template.njk
@@ -1,6 +1,6 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "hint/macro.njk" import govukHint %}
-{% from "label/macro.njk" import govukLabel %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../label/macro.njk" import govukLabel %}
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}

diff --git a/src/components/input/template.njk b/src/components/input/template.njk
@@ -1,6 +1,6 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "hint/macro.njk" import govukHint %}
-{% from "label/macro.njk" import govukLabel %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../label/macro.njk" import govukLabel %}
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}

diff --git a/src/components/phase-banner/template.njk b/src/components/phase-banner/template.njk
@@ -1,4 +1,4 @@
-{% from "tag/macro.njk" import govukTag -%}
+{% from "../tag/macro.njk" import govukTag -%}
 
 <div class="govuk-phase-banner
   {%- if params.classes %} {{ params.classes }}{% endif %}"{% for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>

diff --git a/src/components/radios/template.njk b/src/components/radios/template.njk
@@ -1,7 +1,7 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "fieldset/macro.njk" import govukFieldset %}
-{% from "hint/macro.njk" import govukHint %}
-{% from "label/macro.njk" import govukLabel %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../fieldset/macro.njk" import govukFieldset %}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../label/macro.njk" import govukLabel %}
 
 {#- If an id 'prefix' is not passed, fall back to using the name attribute
    instead. We need this for error messages and hints as well -#}

diff --git a/src/components/select/template.njk b/src/components/select/template.njk
@@ -1,6 +1,6 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "hint/macro.njk" import govukHint %}
-{% from "label/macro.njk" import govukLabel %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../label/macro.njk" import govukLabel %}
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}

diff --git a/src/components/textarea/template.njk b/src/components/textarea/template.njk
@@ -1,6 +1,6 @@
-{% from "error-message/macro.njk" import govukErrorMessage -%}
-{% from "hint/macro.njk" import govukHint %}
-{% from "label/macro.njk" import govukLabel %}
+{% from "../error-message/macro.njk" import govukErrorMessage -%}
+{% from "../hint/macro.njk" import govukHint %}
+{% from "../label/macro.njk" import govukLabel %}
 
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}

diff --git a/src/components/warning-text/template.njk b/src/components/warning-text/template.njk
@@ -1,5 +1,3 @@
-{% from "warning-text/macro.njk" import govukWarningText -%}
-
 <div class="govuk-warning-text {{- ' ' + params.classes if params.classes}}"
   {%- for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor -%}
   >