Skip to content

Commit 75a08a9

Browse files
VIA-599 AS/SB Remove old hub page
1 parent c0f6638 commit 75a08a9

File tree

5 files changed

+17
-206
lines changed

5 files changed

+17
-206
lines changed

e2e/constants.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ type PoliciesPageName = "cookies-policy" | "accessibility-statement";
22
type VaccinePageName = "rsv-older-adults" | "rsv-pregnancy" | "td-ipv" | "6-in-1";
33
type FailurePageName = "sso-failure" | "service-failure" | "not-found";
44
type SessionPageName = "session-timeout" | "session-logout";
5-
type IndexPageName = "vaccines-hub" | "vaccines-for-all-ages" | "multi-vaccines-hub";
5+
type IndexPageName = "vaccines-for-all-ages" | "vaccine-hub";
66

77
export type PageName = IndexPageName | VaccinePageName | FailurePageName | SessionPageName | PoliciesPageName;
88
export type PageDetails = {
@@ -17,17 +17,11 @@ const NHS_TITLE_SUFFIX = "NHS";
1717

1818
export const AppPageDetails: Record<PageName, PageDetails> = {
1919
// index pages
20-
"vaccines-hub": {
21-
url: "/check-and-book-rsv",
22-
heading: `${SERVICE_HEADING}`,
23-
title: `${SERVICE_HEADING} - ${NHS_TITLE_SUFFIX}`,
24-
snapshotFilename: "default-hub.png",
25-
},
26-
"multi-vaccines-hub": {
20+
"vaccine-hub": {
2721
url: "/check-and-book-vaccinations",
2822
heading: `${SERVICE_HEADING}`,
2923
title: `${SERVICE_HEADING} - ${NHS_TITLE_SUFFIX}`,
30-
snapshotFilename: "default-multi-vaccines-hub.png",
24+
snapshotFilename: "default-vaccine-hub.png",
3125
},
3226
"vaccines-for-all-ages": {
3327
url: "/vaccines-for-all-ages",

e2e/general/appNotLoggedIn.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test.describe("Application - User Not Logged In", () => {
1212
test("Not logged in user is directed", async ({ page }) => {
1313
const expectedUrl = getEnv("NHS_APP_REDIRECT_LOGIN_URL");
1414

15-
await page.goto(AppPageDetails["vaccines-hub"].url);
15+
await page.goto(AppPageDetails["vaccine-hub"].url);
1616

1717
expect(page.url()).toBe(expectedUrl);
1818
});

e2e/general/navigation.spec.ts

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,14 @@ test.describe.configure({ mode: "parallel", retries: 3 });
88
test.describe("Navigation", () => {
99
test.use({ storageState: `./e2e/.auth/default.json` });
1010

11-
test("Vaccines and back links from hub page", async ({ page }) => {
12-
await page.goto(AppPageDetails["vaccines-hub"].url);
13-
await clickLinkAndExpectPageTitle(page, "RSV vaccine for older adults", AppPageDetails["rsv-older-adults"].title);
14-
await clickLinkAndExpectPageTitle(page, "Back", AppPageDetails["vaccines-hub"].title);
15-
await clickLinkAndExpectPageTitle(page, "RSV vaccine in pregnancy", AppPageDetails["rsv-pregnancy"].title);
16-
await clickLinkAndExpectPageTitle(page, "Back", AppPageDetails["vaccines-hub"].title);
17-
});
18-
19-
test("Vaccines and back links from multi vaccine hub page", async ({ page }) => {
20-
await page.goto(AppPageDetails["multi-vaccines-hub"].url);
11+
test("vaccines-for-all-ages page and back links from vaccine hub page", async ({ page }) => {
12+
await page.goto(AppPageDetails["vaccine-hub"].url);
2113
await clickLinkAndExpectPageTitle(
2214
page,
2315
"View vaccines for all ages",
2416
AppPageDetails["vaccines-for-all-ages"].title,
2517
);
26-
await clickLinkAndExpectPageTitle(page, "Back", AppPageDetails["multi-vaccines-hub"].title);
18+
await clickLinkAndExpectPageTitle(page, "Back", AppPageDetails["vaccine-hub"].title);
2719
});
2820

2921
test("Vaccines and back links from vaccines-for-all-ages page", async ({ page }) => {
@@ -39,13 +31,17 @@ test.describe("Navigation", () => {
3931
});
4032

4133
test("Skip link navigation", async ({ page }) => {
42-
await page.goto(AppPageDetails["vaccines-hub"].url);
34+
await page.goto(AppPageDetails["vaccine-hub"].url);
4335
await page.getByTestId("skip-link").focus();
4436
await page.keyboard.press("Enter");
4537
await expect(page.getByRole("heading", { level: 1 })).toBeFocused();
4638

4739
// Test skip link still works after navigation
48-
await clickLinkAndExpectPageTitle(page, "RSV vaccine for older adults", AppPageDetails["vaccines-hub"].title);
40+
await clickLinkAndExpectPageTitle(
41+
page,
42+
"View vaccines for all ages",
43+
AppPageDetails["vaccines-for-all-ages"].title,
44+
);
4945
await page.getByTestId("skip-link").focus();
5046
await page.keyboard.press("Enter");
5147
await expect(page.getByRole("heading", { level: 1 })).toBeFocused();
@@ -55,18 +51,18 @@ test.describe("Navigation", () => {
5551
await page.goto(AppPageDetails["rsv-older-adults"].url);
5652
await page.getByRole("link", { name: "Log out" }).waitFor();
5753

58-
await clickLinkAndExpectPageTitle(page, `NHS ${SERVICE_HEADING} homepage`, AppPageDetails["vaccines-hub"].title);
54+
await clickLinkAndExpectPageTitle(page, `NHS ${SERVICE_HEADING} homepage`, AppPageDetails["vaccine-hub"].title);
5955
});
6056

6157
test("Footer links navigate to footer pages", async ({ page }) => {
62-
await page.goto(AppPageDetails["vaccines-hub"].url);
58+
await page.goto(AppPageDetails["vaccine-hub"].url);
6359
await clickLinkAndExpectPageTitle(page, "Cookies", AppPageDetails["cookies-policy"].title);
6460
await clickLinkAndExpectPageTitle(page, "Accessibility statement", AppPageDetails["accessibility-statement"].title);
6561
});
6662

6763
test("Log out link click navigates to session logout page", async ({ page }) => {
68-
await page.goto(AppPageDetails["vaccines-hub"].url);
69-
await expect(page).toHaveTitle(AppPageDetails["vaccines-hub"].title);
64+
await page.goto(AppPageDetails["vaccine-hub"].url);
65+
await expect(page).toHaveTitle(AppPageDetails["vaccine-hub"].title);
7066
await clickLinkAndExpectPageTitle(page, "Log out", AppPageDetails["session-logout"].title);
7167
});
7268
});

src/app/check-and-book-rsv/page.test.tsx

Lines changed: 0 additions & 120 deletions
This file was deleted.

src/app/check-and-book-rsv/page.tsx

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)