Skip to content

Commit 62ce19c

Browse files
committed
OLH-755: rebased after int phone number
1 parent 1c4e999 commit 62ce19c

File tree

5 files changed

+17
-14
lines changed

5 files changed

+17
-14
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"clean-modules": "rm -rf node_modules",
1717
"generate-static-hash": "mkdir -p dist/utils && tar cvf - src/assets | sha1sum | head -c 40 | xargs -I X echo '{\"hash\":\"X\"}' > dist/utils/static-hash.json",
1818
"copy-assets": "copyfiles -u 1 src/**/*.njk dist/ src/locales/**/** dist/ src/config/*.txt dist/ && npm run copy-scripts",
19-
"copy-scripts": "rm -r dist/public/scripts || true && mkdir -p dist/public/scripts && cp node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js node_modules/@govuk-one-login/frontend-analytics/lib/analytics.js dist/public/scripts && cp -r src/assets/javascript/* dist/public/scripts/",
19+
"copy-scripts": "rm -r dist/public/scripts || true && mkdir -p dist/public/scripts && cp node_modules/govuk-frontend/dist/govuk/govuk-frontend.min.js node_modules/@govuk-one-login/frontend-analytics/lib/analytics.js dist/public/scripts",
2020
"doctor": "NODE_ENV=production clinic doctor --autocannon [ -c 10 -d 10 /healthcheck ] -- node -r dotenv/config dist/server.js && echo '\n\nRemember to clean up files in .clinic and node_trace.*.log\n'",
2121
"deep-clean": "npm cache clear --force && npm cache clean --force && npm run clean && npm ci && npm run build",
2222
"dev": "concurrently -k -p \"[{name}]\" -n \"Sass,TypeScript,Node\" -c \"yellow.bold,cyan.bold,green.bold\" \"npm run watch-sass\" \"npm run watch-ts\" \"npm run watch-node\"",

src/components/change-phone-number/tests/change-phone-number-integration.test.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,16 +330,19 @@ describe("Integration:: change phone number", () => {
330330
.expect(function (res) {
331331
const $ = cheerio.load(res.text);
332332
expect($(testComponent("phoneNumber-error")).text()).toContain(
333-
"You’re already using that phone number. Enter a different phone number"
333+
"You’re already using that phone number. Enter a different UK mobile phone number"
334334
);
335335
})
336336
.expect(400);
337337
expect(res.statusCode).toBe(400);
338338
});
339339

340340

341-
it("should return No UK phone number page", (done) => {
342-
request(app).get(PATH_DATA.NO_UK_PHONE_NUMBER.url).expect(302, done);
341+
it("should return No UK phone number page", async () => {
342+
const res = await request(app)
343+
.get(PATH_DATA.NO_UK_PHONE_NUMBER.url)
344+
.expect(302);
345+
expect(res.statusCode).toBe(302);
343346
});
344347

345348
it("should return internal server error if send-otp-notification API call fails", async () => {

src/components/no-uk-mobile-phone/no-uk-mobile-phone-controller.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Request, Response } from "express";
2-
import { PATH_DATA } from "../../app.constants";
2+
import { PATH_DATA } from "../../app.constants.js";
33
import {
44
mfaMethodTypes,
55
mfaPriorityIdentifiers,
6-
} from "../../utils/mfaClient/types";
7-
import { MFA_COMMON_OPL_SETTINGS, setOplSettings } from "../../utils/opl";
6+
} from "../../utils/mfaClient/types.js";
7+
import { MFA_COMMON_OPL_SETTINGS, setOplSettings } from "../../utils/opl.js";
88
import { MetricUnit } from "@aws-lambda-powertools/metrics";
99

1010
const NO_UK_PHONE_NUMBER_TEMPLATE = "no-uk-mobile-phone/index.njk";

src/components/no-uk-mobile-phone/no-uk-mobile-phone-routes.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as express from "express";
2-
import { PATH_DATA } from "../../app.constants";
3-
import { requiresAuthMiddleware } from "../../middleware/requires-auth-middleware";
4-
import { noUkPhoneNumberGet } from "./no-uk-mobile-phone-controller";
5-
import { validateStateMiddleware } from "../../middleware/validate-state-middleware";
6-
import { SetState } from "../../utils/set-state";
7-
import { EventType, UserJourney } from "../../utils/state-machine";
2+
import { PATH_DATA } from "../../app.constants.js";
3+
import { requiresAuthMiddleware } from "../../middleware/requires-auth-middleware.js";
4+
import { noUkPhoneNumberGet } from "./no-uk-mobile-phone-controller.js";
5+
import { validateStateMiddleware } from "../../middleware/validate-state-middleware.js";
6+
import { SetState } from "../../utils/set-state.js";
7+
import { EventType, UserJourney } from "../../utils/state-machine.js";
88

99
const router = express.Router();
1010

src/utils/set-state.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Request, Response, NextFunction, RequestHandler } from "express";
2-
import { UserJourney, EventType, getNextState } from "./state-machine";
2+
import { UserJourney, EventType, getNextState } from "./state-machine.js";
33

44
export function SetState(
55
currentStateTypes: UserJourney[],

0 commit comments

Comments
 (0)