fix(layout): tighten admin path match + real-component PublicChrome tests

Author: LucasCharrier

packages/app/src/e2e/admin.e2e.ts

@@ -13,7 +13,14 @@ test("admin user can access /admin and sees backoffice page", async ({
 test("admin routes hide the public footer and help banner", async ({
 	page,
 }) => {
+	// Runs in the authenticated `chromium` Playwright project (see
+	// playwright.config.ts): `page.goto("/admin")` reaches the real backoffice
+	// page, so the assertions below exercise the PublicChrome branch, not a
+	// login-redirect fallback that would trivially pass.
 	await page.goto("/admin");
+	await expect(
+		page.getByRole("heading", { name: "Backoffice", level: 1 }),
+	).toBeVisible();
 	await expect(page.locator("footer#footer")).toHaveCount(0);
 	await expect(
 		page.getByRole("region", { name: "Ressources et aide" }),

packages/app/src/modules/layout/PublicChrome.tsx

@@ -12,7 +12,9 @@ import { ResourceBanner } from "./ResourceBanner";
  */
 export function PublicChrome() {
 	const pathname = usePathname();
-	if (pathname?.startsWith("/admin")) {
+	// Match the `/admin` segment boundary so hypothetical sibling routes like
+	// `/administrator` or `/admin-tools` keep the public chrome.
+	if (pathname === "/admin" || pathname?.startsWith("/admin/")) {
 		return null;
 	}
 	return (

packages/app/src/modules/layout/__tests__/PublicChrome.test.tsx

@@ -1,17 +1,12 @@
 import { render, screen } from "@testing-library/react";
 import { usePathname } from "next/navigation";
-import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { beforeEach, describe, expect, it, type Mock } from "vitest";
 
 import { PublicChrome } from "../PublicChrome";
 
-vi.mock("../Footer", () => ({
-	Footer: () => <footer data-testid="public-footer">footer</footer>,
-}));
-vi.mock("../ResourceBanner", () => ({
-	ResourceBanner: () => (
-		<section data-testid="public-resource-banner">banner</section>
-	),
-}));
+// Renders real Footer + ResourceBanner; only their external deps
+// (next/link, next/image, next/navigation) are mocked globally in test/setup.ts,
+// so a regression inside either landmark would fail this file.
 
 describe("PublicChrome", () => {
 	beforeEach(() => {
@@ -20,8 +15,10 @@ describe("PublicChrome", () => {
 
 	it("renders ResourceBanner + Footer on public routes", () => {
 		render(<PublicChrome />);
-		expect(screen.getByTestId("public-resource-banner")).toBeInTheDocument();
-		expect(screen.getByTestId("public-footer")).toBeInTheDocument();
+		expect(
+			screen.getByRole("region", { name: /ressources et aide/i }),
+		).toBeInTheDocument();
+		expect(screen.getByRole("contentinfo")).toBeInTheDocument();
 	});
 
 	it("renders nothing on /admin", () => {
@@ -39,6 +36,18 @@ describe("PublicChrome", () => {
 	it("renders chrome on non-admin nested routes", () => {
 		(usePathname as Mock).mockReturnValue("/mon-espace/declarations");
 		render(<PublicChrome />);
-		expect(screen.getByTestId("public-footer")).toBeInTheDocument();
+		expect(
+			screen.getByRole("region", { name: /ressources et aide/i }),
+		).toBeInTheDocument();
+		expect(screen.getByRole("contentinfo")).toBeInTheDocument();
+	});
+
+	it("renders chrome on sibling routes whose name merely starts with 'admin'", () => {
+		(usePathname as Mock).mockReturnValue("/administrator");
+		render(<PublicChrome />);
+		expect(
+			screen.getByRole("region", { name: /ressources et aide/i }),
+		).toBeInTheDocument();
+		expect(screen.getByRole("contentinfo")).toBeInTheDocument();
 	});
 });