rename templates folder

src/routes/form-wizard/check/steps.js

@@ -17,7 +17,7 @@ export default {
     entryPoint: true,
     resetJourney: true,
     next: 'dataset',
-    template: '../views/checkPages/start.html',
+    template: '../views/check/start.html',
     noPost: true
   },
   // '/data-subject': {
@@ -88,6 +88,7 @@ export default {
   '/confirmation': {
     ...baseSettings,
     noPost: true,
-    checkJourney: false // ToDo: it would be useful here if we make sure they have selected if their results are ok from the previous step
+    checkJourney: false, // ToDo: it would be useful here if we make sure they have selected if their results are ok from the previous step
+    template: 'check/confirmation.html'
   }
 }

src/routes/form-wizard/endpoint-submission-form/steps.js

@@ -14,8 +14,8 @@ export default {
     entryPoint: true,
     resetJourney: true,
     noPost: true,
-    template: '../views/endpointSubmissionFormPages/start.html',
-    next: '/submit/lpa-details'
+    template: 'submit/start.html',
+    next: 'submit/lpa-details'
   },
   '/lpa-details': {
     ...defaultParams,
@@ -43,6 +43,7 @@ export default {
     backLink: '/dataset-details'
   },
   '/confirmation': {
-    ...defaultParams
+    ...defaultParams,
+    template: 'submit/confirmation.html'
   }
 }

src/serverSetup/nunjucks.js

@@ -9,8 +9,8 @@ export function setupNunjucks ({ app, dataSubjects }) {
 
   const nunjucksEnv = nunjucks.configure([
     'src/views',
-    'src/views/checkPages',
-    'src/views/endpointSubmissionFormPages',
+    'src/views/check',
+    'src/views/submit',
     'node_modules/govuk-frontend/dist/',
     'node_modules/@x-govuk/govuk-prototype-components/'
   ], {

test/unit/check/confirmationPage.test.js

@@ -0,0 +1,29 @@
+/* eslint-disable prefer-regex-literals */
+
+import { describe, expect, it } from 'vitest'
+import { setupNunjucks } from '../../../src/serverSetup/nunjucks.js'
+import { runGenericPageTests } from '../generic-page.js'
+import config from '../../../config/index.js'
+import { stripWhitespace } from '../../utils/stripWhiteSpace.js'
+import { mockDataSubjects } from '../data.js'
+
+const nunjucks = setupNunjucks({ dataSubjects: mockDataSubjects })
+
+describe('Check confirmation View', () => {
+  const params = {
+    values: {
+      dataset: 'mockDataset'
+    }
+  }
+  const html = stripWhitespace(nunjucks.render('submit/confirmation.html', params))
+
+  runGenericPageTests(html, {
+    pageTitle: 'A Mock dataset submitted - Submit planning and housing data for England',
+    serviceName: config.serviceName
+  })
+
+  it('should render the gov uk panel', () => {
+    const regex = new RegExp('<h1 class="govuk-panel__title".*A Mock dataset submitted.*</h1>', 'g')
+    expect(html).toMatch(regex)
+  })
+})

test/unit/endpointSubmissionForm/confirmationPage.test.js

@@ -0,0 +1,29 @@
+/* eslint-disable prefer-regex-literals */
+
+import { describe, expect, it } from 'vitest'
+import { setupNunjucks } from '../../../src/serverSetup/nunjucks.js'
+import { runGenericPageTests } from '../generic-page.js'
+import config from '../../../config/index.js'
+import { stripWhitespace } from '../../utils/stripWhiteSpace.js'
+import { mockDataSubjects } from '../data.js'
+
+const nunjucks = setupNunjucks({ dataSubjects: mockDataSubjects })
+
+describe('Submit confirmation View', () => {
+  const params = {
+    values: {
+      dataset: 'mockDataset'
+    }
+  }
+  const html = stripWhitespace(nunjucks.render('submit/confirmation.html', params))
+
+  runGenericPageTests(html, {
+    pageTitle: 'A Mock dataset submitted - Submit planning and housing data for England',
+    serviceName: config.serviceName
+  })
+
+  it('should render the gov uk panel', () => {
+    const regex = new RegExp('<h1 class="govuk-panel__title".*A Mock dataset submitted.*</h1>', 'g')
+    expect(html).toMatch(regex)
+  })
+})

test/unit/errorsPage.test.js

@@ -11,8 +11,8 @@ import paginationTemplateTests from './paginationTemplateTests.js'
 
 const nunjucksEnv = nunjucks.configure([
   'src/views',
-  'src/views/checkPages',
-  'src/views/endpointSubmissionFormPages',
+  'src/views/check',
+  'src/views/submit',
   'node_modules/govuk-frontend/dist/',
   'node_modules/@x-govuk/govuk-prototype-components/'
 ], {