Skip to content

Commit

Permalink
Merge pull request #743 from alphagov/use-relative-imports-in-components
Browse files Browse the repository at this point in the history
Use relative imports in components
  • Loading branch information
36degrees authored May 31, 2018
2 parents 64d36f1 + a57c784 commit a808f16
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 27 deletions.
27 changes: 27 additions & 0 deletions src/components/all.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/* eslint-env jest */

const { allComponents } = require('../../lib/file-helper')

const configPaths = require('../../config/paths.json')

// We can't use the render function from jest-helpers, because we need control
// over the nunjucks environment.
const nunjucks = require('nunjucks')

describe('When nunjucks is configured with a different base path', () => {
beforeAll(() => {
// Create a new Nunjucks environment that uses the src directory as its
// base path, rather than the components folder itself
nunjucks.configure(configPaths.src)
})

allComponents.forEach((component) => {
describe(`the ${component} component`, () => {
it('can be rendered without erroring', () => {
expect(() => {
nunjucks.render(`components/${component}/template.njk`, {})
}).not.toThrow()
})
})
})
})
8 changes: 4 additions & 4 deletions src/components/checkboxes/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
8 changes: 4 additions & 4 deletions src/components/date-input/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
6 changes: 3 additions & 3 deletions src/components/file-upload/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
6 changes: 3 additions & 3 deletions src/components/input/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
2 changes: 1 addition & 1 deletion src/components/phase-banner/template.njk
Original file line number Diff line number Diff line change
@@ -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 %}>
Expand Down
8 changes: 4 additions & 4 deletions src/components/radios/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
6 changes: 3 additions & 3 deletions src/components/select/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
6 changes: 3 additions & 3 deletions src/components/textarea/template.njk
Original file line number Diff line number Diff line change
@@ -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 -#}
Expand Down
2 changes: 0 additions & 2 deletions src/components/warning-text/template.njk
Original file line number Diff line number Diff line change
@@ -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 -%}
>
Expand Down

0 comments on commit a808f16

Please sign in to comment.