Merge pull request #163 from alphagov/GOVSI-519-interruption-screen-for-terms-and-conds-update

Govsi 519 interruption screen for terms and conds update

Author: Sandeep Singh

package.json

@@ -95,6 +95,7 @@
     "cheerio": "^1.0.0-rc.10",
     "copyfiles": "^2.4.1",
     "concurrently": "^6.2.0",
+    "decache": "^4.6.0",
     "dotenv": "^10.0.0",
     "eslint": "^7.30.0",
     "eslint-config-prettier": "^8.3.0",

src/app.constants.ts

@@ -13,6 +13,7 @@ export const PATH_NAMES = {
   LOG_IN_ENTER_PHONE_NUMBER: "/enter-phone-number",
   CHECK_YOUR_PHONE: "/check-your-phone",
   SHARE_INFO: "/share-info",
+  UPDATED_TERMS_AND_CONDITIONS: "/updated-terms-and-conditions",
   ENTER_MFA: "/enter-code",
   SECURITY_CODE_EXPIRED: "/security-code-expired",
   AUTH_CODE: "/auth-code",
@@ -70,6 +71,7 @@ export const USER_STATE = {
     "PHONE_NUMBER_CODE_MAX_RETRIES_REACHED",
   MFA_CODE_SENT: "MFA_CODE_SENT",
   ADDED_CONSENT: "ADDED_CONSENT",
+  UPDATED_TERMS_AND_CONDITIONS: "UPDATED_TERMS_AND_CONDITIONS",
 };
 
 export enum NOTIFICATION_TYPE {

src/app.ts

@@ -42,6 +42,7 @@ import { resendMfaCodeRouter } from "./components/resend-mfa-code/resend-mfa-cod
 import { signedOutRouter } from "./components/signed-out/signed-out-routes";
 import { getSessionIdMiddleware } from "./middleware/session-middleware";
 import { shareInfoRouter } from "./components/share-info/share-info-routes";
+import { updatedTermsCondsRouter } from "./components/updated-terms-conds/updated-terms-conds-routes";
 
 const APP_VIEWS = [
   path.join(__dirname, "components"),
@@ -65,6 +66,7 @@ function registerRoutes(app: express.Application) {
   app.use(resendMfaCodeRouter);
   app.use(signedOutRouter);
   app.use(shareInfoRouter);
+  app.use(updatedTermsCondsRouter);
 }
 
 function createApp(): express.Application {

src/assets/scss/application.scss

@@ -1 +1,36 @@
 @use "../../../node_modules/govuk-frontend/govuk/all";
+
+.interrupt-screen {
+  background-color: #1d70b8;
+  padding-top: 50px;
+  padding-bottom: 50px;
+}
+
+.govuk-white-text {
+  color: #ffffff;
+}
+
+.govuk-blue-text {
+  color: #1d70b8;
+  font-weight: bold;
+}
+
+.govuk-white-button {
+  background-color: #ffffff;
+}
+
+.govuk-white-link {
+  color: #ffffff;
+  font-weight: bold;
+}
+
+.govuk-btn-link {
+  border: none;
+  font-weight: bold;
+  outline: none;
+  background: none;
+  cursor: pointer;
+  color: #ffffff;
+  box-shadow: 0px 1px #ffffff;
+  padding: 0;
+}

src/components/check-your-phone/tests/check-your-phone-integration.test.ts

@@ -3,7 +3,7 @@ import { describe } from "mocha";
 import { expect, sinon } from "../../../../test/utils/test-utils";
 import nock = require("nock");
 import * as cheerio from "cheerio";
-import * as sessionMiddleware from "../../../middleware/session-middleware";
+import decache from "decache";
 
 describe("Integration:: check your phone", () => {
   let sandbox: sinon.SinonSandbox;
@@ -13,6 +13,9 @@ describe("Integration:: check your phone", () => {
   let baseApi: string;
 
   before(() => {
+    decache("../../../app");
+    decache("../../../middleware/session-middleware");
+    const sessionMiddleware = require("../../../middleware/session-middleware");
     sandbox = sinon.createSandbox();
     sandbox
       .stub(sessionMiddleware, "validateSessionMiddleware")

src/components/common/layout/base.njk

@@ -53,7 +53,7 @@
         }) }}
 	      {% block beforeContent %}{% endblock %}
 	      <main class="govuk-main-wrapper {{ mainClasses }}" id="main-content" role="main"{% if mainLang %} lang="{{ mainLang }}"{% endif %}>
-          <div class="govuk-grid-row">
+          <div class="govuk-grid-row {{ rowClasses }}">
             <div class="govuk-grid-column-two-thirds">
               {% block content %}{% endblock %}
             </div>

src/components/create-password/tests/create-password-integration.test.ts

@@ -3,7 +3,7 @@ import { after, describe } from "mocha";
 import { expect, sinon } from "../../../../test/utils/test-utils";
 import nock = require("nock");
 import * as cheerio from "cheerio";
-import * as sessionMiddleware from "../../../middleware/session-middleware";
+import decache from "decache";
 
 describe("Integration::register create password", () => {
   let sandbox: sinon.SinonSandbox;
@@ -13,6 +13,9 @@ describe("Integration::register create password", () => {
   let baseApi: string;
 
   before(() => {
+    decache("../../../app");
+    decache("../../../middleware/session-middleware");
+    const sessionMiddleware = require("../../../middleware/session-middleware");
     sandbox = sinon.createSandbox();
     sandbox
       .stub(sessionMiddleware, "validateSessionMiddleware")

src/components/enter-email/tests/enter-email-integration.test.ts

@@ -3,7 +3,7 @@ import { describe } from "mocha";
 import { expect, sinon } from "../../../../test/utils/test-utils";
 import nock = require("nock");
 import * as cheerio from "cheerio";
-import * as sessionMiddleware from "../../../middleware/session-middleware";
+import decache from "decache";
 
 describe("Integration::enter email", () => {
   let sandbox: sinon.SinonSandbox;
@@ -13,6 +13,9 @@ describe("Integration::enter email", () => {
   let baseApi: string;
 
   before(() => {
+    decache("../../../app");
+    decache("../../../middleware/session-middleware");
+    const sessionMiddleware = require("../../../middleware/session-middleware");
     sandbox = sinon.createSandbox();
     sandbox
       .stub(sessionMiddleware, "validateSessionMiddleware")

src/components/enter-mfa/tests/enter-mfa-integration.test.ts

@@ -3,7 +3,7 @@ import { describe } from "mocha";
 import { expect, sinon } from "../../../../test/utils/test-utils";
 import nock = require("nock");
 import * as cheerio from "cheerio";
-import * as sessionMiddleware from "../../../middleware/session-middleware";
+import decache from "decache";
 
 describe("Integration:: enter mfa", () => {
   let sandbox: sinon.SinonSandbox;
@@ -13,6 +13,9 @@ describe("Integration:: enter mfa", () => {
   let baseApi: string;
 
   before(() => {
+    decache("../../../app");
+    decache("../../../middleware/session-middleware");
+    const sessionMiddleware = require("../../../middleware/session-middleware");
     sandbox = sinon.createSandbox();
     sandbox
       .stub(sessionMiddleware, "validateSessionMiddleware")

src/components/enter-password/tests/enter-password-integration.test.ts

@@ -3,8 +3,8 @@ import { describe } from "mocha";
 import { expect, sinon } from "../../../../test/utils/test-utils";
 import nock = require("nock");
 import * as cheerio from "cheerio";
-import * as sessionMiddleware from "../../../middleware/session-middleware";
 import { USER_STATE } from "../../../app.constants";
+import decache from "decache";
 
 describe("Integration::enter password", () => {
   let sandbox: sinon.SinonSandbox;
@@ -16,6 +16,9 @@ describe("Integration::enter password", () => {
   const ENDPOINT = "/enter-password";
 
   before(() => {
+    decache("../../../app");
+    decache("../../../middleware/session-middleware");
+    const sessionMiddleware = require("../../../middleware/session-middleware");
     sandbox = sinon.createSandbox();
     sandbox
       .stub(sessionMiddleware, "validateSessionMiddleware")