CIV-8456 upgrade node 18v

.nvmrc

@@ -1 +1 @@
-16.0.0
+18.15.0

Dockerfile

@@ -1,5 +1,5 @@
 # ---- Base image ----
-FROM hmctspublic.azurecr.io/base/node:16-alpine as base
+FROM hmctspublic.azurecr.io/base/node:18-alpine as base
 
 ENV PUPPETEER_SKIP_DOWNLOAD=true
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

README.md

@@ -14,7 +14,7 @@ Service delegates most of the non UI responsibilities to underlying services e.g
 
 ### Prerequisites
 
-* [Node.js](https://nodejs.org/) >= 16.0.0
+* [Node.js](https://nodejs.org/) >= 18.15.0
 * [yarn](https://yarnpkg.com/)
 * [Gulp](http://gulpjs.com/)
 * [Docker](https://www.docker.com)

integration-tests.Dockerfile

@@ -1,4 +1,4 @@
-FROM hmctspublic.azurecr.io/base/node:16-alpine
+FROM hmctspublic.azurecr.io/base/node:18-alpine
 
 USER root
 

package.json

@@ -3,7 +3,7 @@
   "version": "1.1.1",
   "private": true,
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.15.0"
   },
   "scripts": {
     "setup": "gulp sass copy-files sass-govuk-frontend",
@@ -53,7 +53,7 @@
     "@types/express": "^4.17.2",
     "@types/i18next-sprintf-postprocessor": "^0.2.0",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^16.0.0",
+    "@types/node": "^18.15.0",
     "@types/nunjucks": "^3.1.4",
     "@types/request-promise-native": "^1.0.16",
     "@types/shortid": "^0.0.29",
@@ -62,6 +62,7 @@
     "body-parser": "^1.19.0",
     "bootstrap-datepicker": "1.9.0",
     "build-url": "^2.0.0",
+    "chardet": "^1.5.1",
     "class-transformer": "^0.5.1",
     "classlist-polyfill": "^1.2.0",
     "cmc-cookies-manager": "github:hmcts/cmc-cookies-manager#3.0.2",
@@ -104,7 +105,7 @@
     "serve-favicon": "^2.5.0",
     "string.prototype.startswith": "^0.2.0",
     "to-boolean": "^1.0.0",
-    "ts-node": "^9.1.1",
+    "ts-node": "^10.9.1",
     "tsconfig-paths": "^3.9.0",
     "tslint-microsoft-contrib": "^6.2.0",
     "typescript": "^3.9.8",

src/integration-test/bootstrap/teardown.ts

@@ -4,15 +4,14 @@ import { IdamClient } from 'integration-test/helpers/clients/idamClient'
 
 module.exports = {
   teardownAll: async function (claimantEmail, defendantEmail) {
+    console.log('teardownAll...')
     try {
       if (process.env.IDAM_URL) {
         if (process.env.SMOKE_TEST_CITIZEN_USERNAME) {
-          await Promise.all([
-            console.log('Deleting test users...'),
-            IdamClient.deleteUser(claimantEmail),
-            IdamClient.deleteUser(defendantEmail),
-            IdamClient.deleteUsers([claimantEmail, defendantEmail])
-          ])
+          console.log('Deleting test users...')
+          await IdamClient.deleteUser(claimantEmail)
+          await IdamClient.deleteUser(defendantEmail)
+          await IdamClient.deleteUsers([claimantEmail, defendantEmail])
         }
       }
     } catch (error) {

src/integration-test/helpers/clients/idamClient.ts

@@ -62,12 +62,17 @@ export class IdamClient {
       uri: `${baseURL}/testing-support/accounts/${username}`
     }
 
-    return request(options).then(function (resp) {
-      return Promise.resolve()
-    }).catch(function (err) {
-      // tslint:disable-next-line:no-console
-      console.log(`error deleting user: ${username}` + err)
-    })
+    request(options)
+      .then(function (resp) {
+        // tslint:disable-next-line:no-console
+        console.log(`deleteUser for ${username} got response: ${resp}`)
+        return Promise.resolve()
+      })
+      .catch(function (err) {
+        // tslint:disable-next-line:no-console
+        console.log(`error deleting user: ${username}` + err)
+      })
+    return Promise.resolve()
   }
 
   /**
@@ -85,14 +90,15 @@ export class IdamClient {
       uri: `${baseURL}/testing-support/test-data?${params}&async=true`
     }
 
-    return request(options).then(function (resp) {
+    request(options).then(function (resp) {
       // tslint:disable-next-line:no-console
-      console.log(resp)
+      console.log(`deleteUsers for ${JSON.stringify(usernames)} got response: ${resp}`)
       return Promise.resolve()
     }).catch(function (err) {
       // tslint:disable-next-line:no-console
       console.log(`error deleting user/s ${params}: ` + err)
     })
+    return Promise.resolve()
   }
 
   /**

src/integration-test/tests/citizen/claim/steps/claim.ts

@@ -227,7 +227,7 @@ export class ClaimSteps {
     I.see(AmountHelper.formatMoney(claimAmount.getTotal()), 'table.table-form > tfoot > tr > td.numeric.last > span')
     interestSteps.skipClaimantInterestTotalPage()
     this.enterClaimDetails()
-    I.bypassPCQ()
+    await I.bypassPCQ().catch(e => { return false })
     userSteps.selectCheckAndSubmitYourClaim()
     await this.checkClaimFactsAreTrueAndSubmit(I, claimantType, defendantType, enterDefendantEmail)
   }
@@ -299,7 +299,7 @@ export class ClaimSteps {
     I.see(AmountHelper.formatMoney(claimAmount.getTotal()), 'table.table-form > tfoot > tr > td.numeric.last > span')
     interestSteps.skipClaimantInterestTotalPage()
     this.enterClaimDetails()
-    I.bypassPCQ()
+    await I.bypassPCQ().catch(e => { return false })
     userSteps.selectCheckAndSubmitYourClaim()
     I.see('Mr. John Smith')
     I.see('10, DALBERG')
@@ -391,7 +391,7 @@ export class ClaimSteps {
     I.see(AmountHelper.formatMoney(claimAmount.getTotal()), 'table.table-form > tfoot > tr > td.numeric.last > span')
     interestSteps.skipClaimantInterestTotalPage()
     this.enterClaimDetails()
-    I.bypassPCQ()
+    await I.bypassPCQ().catch(e => { return false })
     userSteps.selectCheckAndSubmitYourClaim()
     I.see('Mr. John Smith')
     I.see('10, DALBERG')

src/integration-test/tests/citizen/claimantResponse/full_admission_test.ts

@@ -31,7 +31,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
   Scenario('Defendant agreed to pay all of the claim via immediate payment route... @fullAdmission @citizen @admissions', { retries: 3 }, async (I: I) => {
     testData.paymentOption = PaymentOption.IMMEDIATELY
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -47,7 +47,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
     testData.paymentOption = PaymentOption.BY_SET_DATE
     const claimantResponseTestData = new ClaimantResponseTestData()
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -65,7 +65,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
     testData.claimantPaymentOption = PaymentOption.IMMEDIATELY
     const claimantResponseTestData = new ClaimantResponseTestData()
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -82,7 +82,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
     testData.claimantPaymentOption = PaymentOption.BY_SET_DATE
     const claimantResponseTestData = new ClaimantResponseTestData()
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -100,7 +100,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
     testData.claimantPaymentOption = PaymentOption.INSTALMENTS
     const claimantResponseTestData = new ClaimantResponseTestData()
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -118,7 +118,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
     testData.claimantPaymentOption = PaymentOption.INSTALMENTS
     const unreasonableClaimantResponseTestDate = new UnreasonableClaimantResponseTestData()
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -134,7 +134,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
   Scenario('I can as a claimant accept the defendants full admission by set date with CCJ and no previous payments made @admissions @citizen', { retries: 3 }, async (I: I) => {
     testData.paymentOption = PaymentOption.BY_SET_DATE
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -148,7 +148,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
   Scenario('I can as a claimant accept the defendants full admission by set date with CCJ and a previous payment made @admissions @citizen', { retries: 3 }, async (I: I) => {
     testData.paymentOption = PaymentOption.BY_SET_DATE
     // as defendant
-    helperSteps.finishResponseWithFullAdmission(testData)
+    await helperSteps.finishResponseWithFullAdmission(testData)
     I.click('Sign out')
     // as claimant
     userSteps.login(testData.claimantEmail)
@@ -167,7 +167,7 @@ if (process.env.FEATURE_ADMISSIONS === 'true') {
       claimantResponseTestData.isExpectingToSeeCourtOfferedInstalmentsPage = true
       claimantResponseTestData.pageSpecificValues.settleClaimEnterDate = '2019-01-01'
     // as defendant
-      helperSteps.finishResponseWithFullAdmission(testData)
+      await helperSteps.finishResponseWithFullAdmission(testData)
       I.click('Sign out')
     // as claimant
       userSteps.login(testData.claimantEmail)

src/integration-test/tests/citizen/defence/steps/defence.ts

@@ -366,14 +366,14 @@ export class DefenceSteps {
     I.waitForText('You’ve submitted your response')
   }
 
-  makeFullAdmission (
+  async makeFullAdmission (
     defendantParty: Party,
     defendantType: PartyType,
     paymentOption: PaymentOption,
     claimantName: string,
     statementOfMeansFullDataSet: boolean = true,
     respondToPCQ?: boolean
-  ): void {
+  ): Promise<void> {
     this.confirmYourDetails(defendantParty)
 
     this.requestMoreTimeToRespond()
@@ -407,7 +407,7 @@ export class DefenceSteps {
     }
 
     defendantSteps.selectCheckAndSubmitYourDefence()
-    I.bypassPCQ()
+    await I.bypassPCQ()
     this.checkAndSendAndSubmit(defendantType, DefenceType.FULL_ADMISSION)
 
     I.see('You’ve submitted your response')

src/integration-test/tests/citizen/endToEnd/AdmitAllOfTheClaim_test.ts

@@ -34,14 +34,14 @@ Before(async (I: I) => {
 if (process.env.FEATURE_ADMISSIONS === 'true') {
 
   Scenario('Admit all of the claim(Pay Immediately) @citizen @nightly @admissions', { retries: 3 }, async (I: I) => {
-    defenceSteps.makeFullAdmission(defendant, PartyType.INDIVIDUAL, PaymentOption.IMMEDIATELY, claimant, false)
+    await defenceSteps.makeFullAdmission(defendant, PartyType.INDIVIDUAL, PaymentOption.IMMEDIATELY, claimant, false)
   })
 
   Scenario('Admit all of the claim(Pay By Set Date) @citizen @nightly @admissions', { retries: 3 }, async (I: I) => {
-    defenceSteps.makeFullAdmission(defendant, PartyType.INDIVIDUAL, PaymentOption.BY_SET_DATE, claimant, false)
+    await defenceSteps.makeFullAdmission(defendant, PartyType.INDIVIDUAL, PaymentOption.BY_SET_DATE, claimant, false)
   })
 
   Scenario('Admit all of the claim(Pay By Instalment) with PCQ @citizen @admissions', { retries: 3 }, async (I: I) => {
-    defenceSteps.makeFullAdmission(defendant, PartyType.INDIVIDUAL, PaymentOption.INSTALMENTS, claimant, false, true)
+    await defenceSteps.makeFullAdmission(defendant, PartyType.INDIVIDUAL, PaymentOption.INSTALMENTS, claimant, false, true)
   })
 }

src/integration-test/tests/citizen/endToEnd/steps/helper.ts

@@ -48,14 +48,14 @@ export class Helper {
   }
 
   // TODO: refactor with above ^^^
-  finishResponseWithFullAdmission (testData: EndToEndTestData): void {
+  async finishResponseWithFullAdmission (testData: EndToEndTestData): Promise<void> {
     if (testData.paymentOption === undefined) {
       testData.paymentOption = PaymentOption.IMMEDIATELY
     }
     defenceSteps.loginAsDefendant(testData.defendantEmail)
     I.click(testData.claimRef)
     I.click('Respond to claim')
-    defenceSteps.makeFullAdmission(testData.defendant, testData.defendantPartyType, testData.paymentOption, testData.claimantName, false)
+    await defenceSteps.makeFullAdmission(testData.defendant, testData.defendantPartyType, testData.paymentOption, testData.claimantName, false)
   }
 
   finishResponseWithHandOff (claimRef: string, defendant: Party, claimant: Party, defendantEmail: string, defenceType: DefenceType): void {

src/main/features/claim/helpers/taskListBuilder.ts

@@ -26,7 +26,9 @@ export class TaskListBuilder extends TaskStatus {
         new TaskListItem('Claim amount', Paths.amountPage.uri, claimAmountCompleted),
         new TaskListItem('Claim details', Paths.reasonPage.uri, ClaimDetails.isCompleted(draft))
       ])
-    )
+      ).catch(error => {
+        throw new Error(`Build prepare your claim section - ${error}`)
+      })
   }
 
   static async buildSubmitSection (): Promise<TaskList> {
@@ -43,5 +45,8 @@ export class TaskListBuilder extends TaskStatus {
       .then(prepareYourClaimSection => []
         .concat(TaskListBuilder.buildBeforeYouStartSection(draft).tasks, prepareYourClaimSection.tasks)
         .filter(item => !item.completed))
+      .catch(error => {
+        throw new Error(`Build remaining task error - ${error}`)
+      })
   }
 }

src/main/features/dashboard/helpers/claimStatusFlow.ts

@@ -25,6 +25,7 @@ export class ClaimStatusFlow {
       }
       if (nextPossibleConditions.length === 0) {
         if (!flow.dashboard) {
+          logger.error(`No dashboard for flow: ${JSON.stringify(flow)}`)
           throw new Error(`Trying to render an intermediate state with no dashboard, check the flow's logic`)
         }
         return flow.dashboard

types/steps-override.d.ts

@@ -1,5 +1,4 @@
 declare const Scenario: (string: string, { retries: number }, callback: ICodeceptCallback) => void;
-declare const xScenario: (string: string, { retries: number }, callback: ICodeceptCallback) => void;
 
 declare namespace CodeceptJS {
   export interface I {