diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 06386088d..39b628de6 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -229,8 +229,9 @@ jobs: path: e2e-tests/junit-results.xml reporter: java-junit fail-on-error: false + fail-on-empty: false - # Upload artifacts on failure for debugging + # Upload artifacts on failure for debugging - name: Upload Playwright test results uses: actions/upload-artifact@v6 if: always() && steps.e2e-tests.outcome == 'failure' diff --git a/.github/workflows/job.e2e-test.yml b/.github/workflows/job.e2e-test.yml index 5647a5324..ab32d5b6e 100644 --- a/.github/workflows/job.e2e-test.yml +++ b/.github/workflows/job.e2e-test.yml @@ -125,6 +125,7 @@ jobs: path: e2e-tests/junit-results.xml reporter: java-junit fail-on-error: false + fail-on-empty: false search-files: filesystem # Upload artifacts on failure for debugging diff --git a/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.test.ts b/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.test.ts index 99fd3924f..eb4917b97 100644 --- a/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.test.ts +++ b/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.test.ts @@ -116,7 +116,6 @@ describe("Upper Tribunal Administrative Appeals Chamber page controller", () => expect(getPublicationJson).toHaveBeenCalledWith("test-artefact-123"); expect(renderUtaacDailyHearingListData).toHaveBeenCalledWith(mockJsonData, { locale: "en", - courtName: "Upper Tribunal (Administrative Appeals Chamber)", contentDate: mockArtefact.contentDate, lastReceivedDate: mockArtefact.lastReceivedDate.toISOString(), listTitle: "Upper Tribunal (Administrative Appeals Chamber) Daily Hearing list" diff --git a/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.ts b/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.ts index 1ae99c4ba..fb5b9ed99 100644 --- a/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.ts +++ b/apps/web/src/pages/(list-types)/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/index.ts @@ -20,7 +20,6 @@ export const GET = createSimpleListTypeHandler({ const t = locale === "cy" ? cy : en; const { header, hearings } = renderUtaacDailyHearingListData(jsonData, { locale, - courtName: "Upper Tribunal (Administrative Appeals Chamber)", contentDate: artefact.contentDate, lastReceivedDate: artefact.lastReceivedDate.toISOString(), listTitle: t.pageTitle diff --git a/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.test.ts b/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.test.ts index 1a3d14b2f..d3440d5f1 100644 --- a/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.test.ts +++ b/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.test.ts @@ -117,7 +117,6 @@ describe("Upper Tribunal Lands Chamber page controller", () => { expect(getPublicationJson).toHaveBeenCalledWith("test-artefact-123"); expect(renderUtlcDailyHearingListData).toHaveBeenCalledWith(mockJsonData, { locale: "en", - courtName: "Upper Tribunal (Lands Chamber)", contentDate: mockArtefact.contentDate, lastReceivedDate: mockArtefact.lastReceivedDate.toISOString(), listTitle: "Upper Tribunal (Lands Chamber) Daily Hearing list" diff --git a/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.ts b/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.ts index 6754d75db..52edabe88 100644 --- a/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.ts +++ b/apps/web/src/pages/(list-types)/upper-tribunal-lands-chamber-daily-hearing-list/index.ts @@ -20,7 +20,6 @@ export const GET = createSimpleListTypeHandler({ const t = locale === "cy" ? cy : en; const { header, hearings } = renderUtlcDailyHearingListData(jsonData, { locale, - courtName: "Upper Tribunal (Lands Chamber)", contentDate: artefact.contentDate, lastReceivedDate: artefact.lastReceivedDate.toISOString(), listTitle: t.pageTitle diff --git a/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.test.ts b/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.test.ts index 8b027c7a1..2d0c81d37 100644 --- a/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.test.ts +++ b/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.test.ts @@ -116,7 +116,6 @@ describe("Upper Tribunal Tax and Chancery Chamber page controller", () => { expect(getPublicationJson).toHaveBeenCalledWith("test-artefact-123"); expect(renderUtccDailyHearingListData).toHaveBeenCalledWith(mockJsonData, { locale: "en", - courtName: "Upper Tribunal Tax and Chancery Chamber", contentDate: mockArtefact.contentDate, lastReceivedDate: mockArtefact.lastReceivedDate.toISOString(), listTitle: "Upper Tribunal Tax and Chancery Chamber Daily Hearing list" diff --git a/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.ts b/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.ts index 418d14366..08f94e1f4 100644 --- a/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.ts +++ b/apps/web/src/pages/(list-types)/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/index.ts @@ -20,7 +20,6 @@ export const GET = createSimpleListTypeHandler({ const t = locale === "cy" ? cy : en; const { header, hearings } = renderUtccDailyHearingListData(jsonData, { locale, - courtName: "Upper Tribunal Tax and Chancery Chamber", contentDate: artefact.contentDate, lastReceivedDate: artefact.lastReceivedDate.toISOString(), listTitle: t.pageTitle diff --git a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts index ce28fe749..76d2f6591 100644 --- a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts +++ b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts @@ -153,10 +153,9 @@ describe("generateUtaacDailyHearingListPdf", () => { expect(renderUtaacDailyHearingListData).toHaveBeenCalledWith(mockHearingList, { locale: "cy", - courtName: "Upper Tribunal (Administrative Appeals Chamber)", contentDate, lastReceivedDate: expect.any(String), - listTitle: "Upper Tribunal (Administrative Appeals Chamber) Daily Hearing List" + listTitle: "Rhestr Gwrandawiadau Dyddiol Tribiwnlys Uwch (Siambr Apeliadau Gweinyddol)" }); }); }); diff --git a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.ts b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.ts index 6933593a5..362766a8d 100644 --- a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.ts +++ b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/pdf/pdf-generator.ts @@ -9,8 +9,6 @@ import { renderUtaacDailyHearingListData } from "../rendering/renderer.js"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); export const generateUtaacDailyHearingListPdf = createUtDailyHearingListPdfGenerator( - "Upper Tribunal (Administrative Appeals Chamber)", - "Upper Tribunal (Administrative Appeals Chamber) Daily Hearing List", renderUtaacDailyHearingListData, () => import("../locales/en.js"), () => import("../locales/cy.js"), diff --git a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.test.ts b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.test.ts index f519d25f4..7a16aa74d 100644 --- a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.test.ts +++ b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.test.ts @@ -5,7 +5,6 @@ import { renderUtaacDailyHearingListData } from "./renderer.js"; describe("renderUtaacDailyHearingListData", () => { const baseOptions = { locale: "en", - courtName: "Upper Tribunal (Administrative Appeals Chamber)", contentDate: new Date(2025, 0, 15), lastReceivedDate: "2025-01-15T09:55:00Z", listTitle: "Upper Tribunal (Administrative Appeals Chamber) Daily Hearing List" diff --git a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.ts b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.ts index ff56d161b..df6687741 100644 --- a/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.ts +++ b/libs/list-types/upper-tribunal-administrative-appeals-chamber-daily-hearing-list/src/rendering/renderer.ts @@ -3,7 +3,6 @@ import type { UtaacHearing, UtaacHearingList } from "../models/types.js"; export interface RenderOptions { locale: string; - courtName: string; contentDate: Date; lastReceivedDate: string; listTitle: string; diff --git a/libs/list-types/upper-tribunal-common/src/pdf-generator.test.ts b/libs/list-types/upper-tribunal-common/src/pdf-generator.test.ts index 9279f9b30..efd5a6698 100644 --- a/libs/list-types/upper-tribunal-common/src/pdf-generator.test.ts +++ b/libs/list-types/upper-tribunal-common/src/pdf-generator.test.ts @@ -49,16 +49,7 @@ describe("createUtDailyHearingListPdfGenerator", () => { }); const makeGenerator = () => - createUtDailyHearingListPdfGenerator( - "Test Court", - "Test List Title", - mockRenderFn, - mockImportEn, - mockImportCy, - "/fake/dirname", - mockProvenanceLabels, - mockGeneratePdfFn - ); + createUtDailyHearingListPdfGenerator(mockRenderFn, mockImportEn, mockImportCy, "/fake/dirname", mockProvenanceLabels, mockGeneratePdfFn); it("should generate and store PDF successfully", async () => { // Arrange @@ -71,10 +62,7 @@ describe("createUtDailyHearingListPdfGenerator", () => { // Assert expect(result.success).toBe(true); expect(result.pdfPath).toContain("artefact-123.pdf"); - expect(mockRenderFn).toHaveBeenCalledWith( - baseOptions.jsonData, - expect.objectContaining({ courtName: "Test Court", listTitle: "Test List Title", locale: "en" }) - ); + expect(mockRenderFn).toHaveBeenCalledWith(baseOptions.jsonData, expect.objectContaining({ listTitle: "English", locale: "en" })); }); it("should use Welsh translations when locale is cy", async () => { diff --git a/libs/list-types/upper-tribunal-common/src/pdf-generator.ts b/libs/list-types/upper-tribunal-common/src/pdf-generator.ts index a60a42cf0..19af06cf4 100644 --- a/libs/list-types/upper-tribunal-common/src/pdf-generator.ts +++ b/libs/list-types/upper-tribunal-common/src/pdf-generator.ts @@ -11,7 +11,6 @@ import { export interface DailyHearingListRenderOptions { locale: string; - courtName: string; contentDate: Date; lastReceivedDate: string; listTitle: string; @@ -23,8 +22,6 @@ export interface DailyHearingListRenderedData { } export function createUtDailyHearingListPdfGenerator( - courtName: string, - listTitle: string, renderFn: (data: T, options: DailyHearingListRenderOptions) => DailyHearingListRenderedData, importEn: () => Promise<{ en: Record }>, importCy: () => Promise<{ cy: Record }>, @@ -34,16 +31,15 @@ export function createUtDailyHearingListPdfGenerator( ) { return async function generatePdf(options: BasePdfGenerationOptions & { contentDate: Date }): Promise { try { + const translations = await loadTranslations(options.locale, importEn, importCy); + const renderedData = renderFn(options.jsonData, { locale: options.locale, - courtName, contentDate: options.contentDate, lastReceivedDate: new Date().toISOString(), - listTitle + listTitle: translations.pageTitle as string }); - const translations = await loadTranslations(options.locale, importEn, importCy); - const provenanceLabel = options.provenance ? provenanceLabels[options.provenance] || options.provenance : ""; const env = configureNunjucks(dirname); diff --git a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts index 3cdb268fb..8d5856ada 100644 --- a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts +++ b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts @@ -154,10 +154,9 @@ describe("generateUtlcDailyHearingListPdf", () => { expect(renderUtlcDailyHearingListData).toHaveBeenCalledWith(mockHearingList, { locale: "cy", - courtName: "Upper Tribunal (Lands Chamber)", contentDate, lastReceivedDate: expect.any(String), - listTitle: "Upper Tribunal (Lands Chamber) Daily Hearing List" + listTitle: "Rhestr Gwrandawiadau Dyddiol Tribiwnlys Uwch (Siambr Tiroedd)" }); }); }); diff --git a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.ts b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.ts index 36c48de69..82d20a243 100644 --- a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.ts +++ b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/pdf/pdf-generator.ts @@ -9,8 +9,6 @@ import { renderUtlcDailyHearingListData } from "../rendering/renderer.js"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); export const generateUtlcDailyHearingListPdf = createUtDailyHearingListPdfGenerator( - "Upper Tribunal (Lands Chamber)", - "Upper Tribunal (Lands Chamber) Daily Hearing List", renderUtlcDailyHearingListData, () => import("../locales/en.js"), () => import("../locales/cy.js"), diff --git a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.test.ts b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.test.ts index 9906de221..311f47b73 100644 --- a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.test.ts +++ b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.test.ts @@ -5,7 +5,6 @@ import { renderUtlcDailyHearingListData } from "./renderer.js"; describe("renderUtlcDailyHearingListData", () => { const baseOptions = { locale: "en", - courtName: "Upper Tribunal (Lands Chamber)", contentDate: new Date(2025, 0, 15), lastReceivedDate: "2025-01-15T09:55:00Z", listTitle: "Upper Tribunal (Lands Chamber) Daily Hearing List" diff --git a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.ts b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.ts index c5af5c485..528ac315a 100644 --- a/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.ts +++ b/libs/list-types/upper-tribunal-lands-chamber-daily-hearing-list/src/rendering/renderer.ts @@ -3,7 +3,6 @@ import type { UtlcHearing, UtlcHearingList } from "../models/types.js"; export interface RenderOptions { locale: string; - courtName: string; contentDate: Date; lastReceivedDate: string; listTitle: string; diff --git a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts index 20846ac0c..ab1dbf889 100644 --- a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts +++ b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.test.ts @@ -153,10 +153,9 @@ describe("generateUtccDailyHearingListPdf", () => { expect(renderUtccDailyHearingListData).toHaveBeenCalledWith(mockHearingList, { locale: "cy", - courtName: "Upper Tribunal Tax and Chancery Chamber", contentDate, lastReceivedDate: expect.any(String), - listTitle: "Upper Tribunal Tax and Chancery Chamber Daily Hearing List" + listTitle: "Rhestr Gwrandawiadau Dyddiol Tribiwnlys Uwch Siambr Dreth a Siawnsri" }); }); }); diff --git a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.ts b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.ts index 9bb5fcadd..a5ec990f9 100644 --- a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.ts +++ b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/pdf/pdf-generator.ts @@ -9,8 +9,6 @@ import { renderUtccDailyHearingListData } from "../rendering/renderer.js"; const __dirname = path.dirname(fileURLToPath(import.meta.url)); export const generateUtccDailyHearingListPdf = createUtDailyHearingListPdfGenerator( - "Upper Tribunal Tax and Chancery Chamber", - "Upper Tribunal Tax and Chancery Chamber Daily Hearing List", renderUtccDailyHearingListData, () => import("../locales/en.js"), () => import("../locales/cy.js"), diff --git a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.test.ts b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.test.ts index b2fc28a97..e3fc8842d 100644 --- a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.test.ts +++ b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.test.ts @@ -5,7 +5,6 @@ import { renderUtccDailyHearingListData } from "./renderer.js"; describe("renderUtccDailyHearingListData", () => { const baseOptions = { locale: "en", - courtName: "Upper Tribunal Tax and Chancery Chamber", contentDate: new Date(2025, 0, 15), lastReceivedDate: "2025-01-15T09:55:00Z", listTitle: "Upper Tribunal Tax and Chancery Chamber Daily Hearing List" diff --git a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.ts b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.ts index 64f764ad0..587b4a084 100644 --- a/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.ts +++ b/libs/list-types/upper-tribunal-tax-and-chancery-chamber-daily-hearing-list/src/rendering/renderer.ts @@ -3,7 +3,6 @@ import type { UtccHearing, UtccHearingList } from "../models/types.js"; export interface RenderOptions { locale: string; - courtName: string; contentDate: Date; lastReceivedDate: string; listTitle: string;