Compare commits

..

16 Commits

Author SHA1 Message Date
djalim edb20db2ef test: add e2e, integration, and unit tests for fixtures and mockFetch 2026-04-21 11:24:02 +02:00
djalim 56430f9991 test: add API mock, fixtures, and DOM helpers for tests 2026-04-21 11:23:21 +02:00
djalim 808bf8c9c7 ci: add test job to lint workflow and update deno.json
Add test script to deno.json
Add @std/assert, @std/testing, happy-dom dependencies
2026-04-21 11:22:09 +02:00
djalim e111d5be28 Merge pull request '🐛 (Dockerfile): remove stray 'flag' argument from deno cache command' (#6) from feature/deploy into main
Build and push image / Build Docker image (push) Successful in 20s
Reviewed-on: https://git.polytech.djalim.fr/admin/PolyMPR/pulls/6
2026-01-13 08:08:24 +00:00
djalim c70d4a5f11 🐛 (Dockerfile): remove stray 'flag' argument from deno cache command
Check Deno code / Check Deno code (pull_request) Successful in 14s
2026-01-13 09:07:01 +01:00
djalim ad5c271b05 Merge pull request 'feature/deploy : Added deploy ci tu automaticaly push image to registry' (#5) from feature/deploy into main
Build and push image / Build Docker image (push) Failing after 1m35s
Reviewed-on: https://git.polytech.djalim.fr/admin/PolyMPR/pulls/5
2026-01-13 07:47:18 +00:00
djalim 19a588ac25 🚀 ci: add Docker build and push workflow, remove old Deno check workflow
Check Deno code / Check Deno code (pull_request) Successful in 16s
2026-01-13 08:45:23 +01:00
djalim ad524978df 🔧 (ci.yml): renamed Deno lint workflow for pull requests 2026-01-09 12:57:51 +01:00
djalim 2ce78547b7 Merge pull request '🔧 chore(ci): removed old github workflow folder' (#4) from fix/action into main
Reviewed-on: https://git.polytech.djalim.fr/admin/PolyMPR/pulls/4
2026-01-09 11:52:25 +00:00
djalim 81a3fc0e03 🔧 chore(ci): removed old github workflow folder
Check Deno code / Check Deno code (pull_request) Successful in 13s
2026-01-09 12:50:46 +01:00
djalim 2615961bf1 Merge pull request '🔧 ci: add Deno lint and format check workflow' (#1) from feature/actions into main
Reviewed-on: https://git.polytech.djalim.fr/admin/PolyMPR/pulls/1
2026-01-09 11:48:18 +00:00
djalim fb967e3af3 Merge pull request '🔧 chore: add env.template and load .env instead of .env.development.local' (#2) from feature/dotenv into main
Reviewed-on: https://git.polytech.djalim.fr/admin/PolyMPR/pulls/2
2026-01-09 11:48:05 +00:00
djalim c283a34784 🔧 ci: add Deno lint and format check workflow
Check Deno code / Check Deno code (pull_request) Successful in 5s
2026-01-09 12:47:36 +01:00
djalim a48c616ecc 🔧 chore: add env.template and load .env instead of .env.development.local
Check Deno code / Check Deno code (pull_request) Successful in 5s
2026-01-09 12:47:11 +01:00
djalim cd1149a23a Merge pull request '🐛(components): add missing button types and keys' (#3) from fix/actions into main
Reviewed-on: https://git.polytech.djalim.fr/admin/PolyMPR/pulls/3
2026-01-09 11:44:17 +00:00
djalim 58c8ff56ba 🐛(components): add missing button types and keys
Check Deno code / Check Deno code (pull_request) Successful in 40s
Add type="button" to the EditMobility and UploadStudents buttons
to prevent default form submission behavior.
Include a key prop on Student components in Promotion for stable list rendering.
2026-01-09 12:41:51 +01:00
26 changed files with 347 additions and 75 deletions
+27
View File
@@ -0,0 +1,27 @@
name: "Build and push image"
on:
push:
branches:
- main
jobs:
deploy:
name: "Build Docker image"
runs-on: ubuntu-latest
steps:
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
registry: registry.docker.polytech.djalim.fr
username: ${{ secrets.registry_login }}
password: ${{ secrets.registry_pass }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build and push
uses: docker/build-push-action@v6
with:
push: true
tags: registry.docker.polytech.djalim.fr/polympr:latest
@@ -24,3 +24,6 @@ jobs:
- name: Check linting - name: Check linting
run: deno lint run: deno lint
- name: Run tests
run: deno test -A --no-check tests/
+1 -1
View File
@@ -3,7 +3,7 @@ FROM denoland/deno:alpine
WORKDIR /app WORKDIR /app
COPY . . COPY . .
RUN deno cache main.ts --allow-import flag RUN deno cache main.ts --allow-import
RUN deno task build RUN deno task build
USER deno USER deno
+1 -5
View File
@@ -3,16 +3,12 @@ import { AsyncRoute } from "$fresh/src/server/types.ts";
export interface AuthenticatedState { export interface AuthenticatedState {
isAuthenticated: true; isAuthenticated: true;
isFromPolytech: boolean; session: CasContent;
role: "etudiant" | "professeur" | "administration" | "autre";
displayName: string;
uid: string;
availablePages: Record<string, string>; availablePages: Record<string, string>;
} }
interface UnauthenticatedState { interface UnauthenticatedState {
isAuthenticated: false; isAuthenticated: false;
isFromPolytech: false;
session: undefined; session: undefined;
} }
+5 -1
View File
@@ -9,7 +9,8 @@
"start": "deno run -A --unstable-ffi --watch=static/,routes/ dev.ts", "start": "deno run -A --unstable-ffi --watch=static/,routes/ dev.ts",
"build": "deno run -A --unstable-ffi dev.ts build", "build": "deno run -A --unstable-ffi dev.ts build",
"preview": "deno run -A --unstable-ffi main.ts", "preview": "deno run -A --unstable-ffi main.ts",
"update": "deno run -A -r https://fresh.deno.dev/update ." "update": "deno run -A -r https://fresh.deno.dev/update .",
"test": "deno test -A --no-check tests/"
}, },
"lint": { "lint": {
"rules": { "rules": {
@@ -35,6 +36,9 @@
"@preact/signals": "https://esm.sh/*@preact/signals@1.2.2", "@preact/signals": "https://esm.sh/*@preact/signals@1.2.2",
"@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1", "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1",
"$std/": "https://deno.land/std@0.216.0/", "$std/": "https://deno.land/std@0.216.0/",
"@std/assert": "jsr:@std/assert@^1.0.0",
"@std/testing": "jsr:@std/testing@^1.0.0",
"happy-dom": "npm:happy-dom@^16.0.0",
"$root/": "./", "$root/": "./",
"$apps/": "./routes/(apps)/" "$apps/": "./routes/(apps)/"
}, },
+2
View File
@@ -0,0 +1,2 @@
#Local mode, set to true to access admin pages with any users
LOCAL=false
+1 -1
View File
@@ -2,7 +2,7 @@ import { defineConfig } from "$fresh/server.ts";
import ensureDatabases from "$root/databases/ensure.ts"; import ensureDatabases from "$root/databases/ensure.ts";
import { load } from "@std/dotenv"; import { load } from "@std/dotenv";
await load({ envPath: "./.env.development.local", export: true }); await load({ envPath: "./.env", export: true });
await ensureDatabases(); await ensureDatabases();
export default defineConfig({ export default defineConfig({
server: { server: {
-2
View File
@@ -19,7 +19,6 @@ import * as $_apps_students_partials_admin_consult from "./routes/(apps)/student
import * as $_apps_students_partials_admin_upload from "./routes/(apps)/students/partials/(admin)/upload.tsx"; import * as $_apps_students_partials_admin_upload from "./routes/(apps)/students/partials/(admin)/upload.tsx";
import * as $_apps_students_partials_index from "./routes/(apps)/students/partials/index.tsx"; import * as $_apps_students_partials_index from "./routes/(apps)/students/partials/index.tsx";
import * as $_apps_students_types_d from "./routes/(apps)/students/types.d.ts"; import * as $_apps_students_types_d from "./routes/(apps)/students/types.d.ts";
import * as $_403 from "./routes/_403.tsx";
import * as $_404 from "./routes/_404.tsx"; import * as $_404 from "./routes/_404.tsx";
import * as $_app from "./routes/_app.tsx"; import * as $_app from "./routes/_app.tsx";
import * as $_middleware from "./routes/_middleware.ts"; import * as $_middleware from "./routes/_middleware.ts";
@@ -65,7 +64,6 @@ const manifest = {
"./routes/(apps)/students/partials/index.tsx": "./routes/(apps)/students/partials/index.tsx":
$_apps_students_partials_index, $_apps_students_partials_index,
"./routes/(apps)/students/types.d.ts": $_apps_students_types_d, "./routes/(apps)/students/types.d.ts": $_apps_students_types_d,
"./routes/_403.tsx": $_403,
"./routes/_404.tsx": $_404, "./routes/_404.tsx": $_404,
"./routes/_app.tsx": $_app, "./routes/_app.tsx": $_app,
"./routes/_middleware.ts": $_middleware, "./routes/_middleware.ts": $_middleware,
+1 -1
View File
@@ -23,7 +23,7 @@ export const handler: MiddlewareHandler<AuthenticatedState>[] = [
context.state.availablePages = properties.pages; context.state.availablePages = properties.pages;
if ( if (
context.state.role == "etudiant" && context.state.session.eduPersonPrimaryAffiliation == "student" &&
Deno.env.get("LOCAL") != "true" Deno.env.get("LOCAL") != "true"
) { ) {
properties.adminOnly.forEach((page) => properties.adminOnly.forEach((page) =>
@@ -240,7 +240,7 @@ export default function EditMobility() {
</table> </table>
</div> </div>
))} ))}
<button onClick={handleSave} disabled={isSaving}> <button type="button" onClick={handleSave} disabled={isSaving}>
{isSaving ? "Saving..." : "Confirm"} {isSaving ? "Saving..." : "Confirm"}
</button> </button>
</section> </section>
+1 -1
View File
@@ -7,7 +7,7 @@ import { State } from "$root/routes/_middleware.ts";
// deno-lint-ignore require-await // deno-lint-ignore require-await
export async function Index(_request: Request, context: FreshContext<State>) { export async function Index(_request: Request, context: FreshContext<State>) {
return <h2>Welcome to {context.state.displayName || 'Guest'}.</h2>; return <h2>Welcome to {context.state.session?.displayName}.</h2>;
} }
export const config = getPartialsConfig(); export const config = getPartialsConfig();
@@ -7,7 +7,7 @@ import { State } from "$root/routes/_middleware.ts";
// deno-lint-ignore require-await // deno-lint-ignore require-await
async function Courses(_request: Request, context: FreshContext<State>) { async function Courses(_request: Request, context: FreshContext<State>) {
return <h2>Welcome to {context.state.displayName || 'Guest'}.</h2>; return <h2>Welcome to {context.state.session?.displayName}.</h2>;
} }
export const config = getPartialsConfig(); export const config = getPartialsConfig();
+1 -1
View File
@@ -7,7 +7,7 @@ import { State } from "$root/routes/_middleware.ts";
// deno-lint-ignore require-await // deno-lint-ignore require-await
export async function Index(_request: Request, context: FreshContext<State>) { export async function Index(_request: Request, context: FreshContext<State>) {
return <h2>Welcome to {context.state.displayName || 'Guest'}.</h2>; return <h2>Welcome to {context.state.session?.displayName}.</h2>;
} }
export const config = getPartialsConfig(); export const config = getPartialsConfig();
+1 -1
View File
@@ -7,7 +7,7 @@ import { State } from "$root/routes/_middleware.ts";
// deno-lint-ignore require-await // deno-lint-ignore require-await
async function Notes(_request: Request, context: FreshContext<State>) { async function Notes(_request: Request, context: FreshContext<State>) {
return <h2>Welcome to {context.state.displayName || 'Guest'}.</h2>; return <h2>Welcome to {context.state.session?.displayName}.</h2>;
} }
export const config = getPartialsConfig(); export const config = getPartialsConfig();
@@ -22,7 +22,7 @@ export default function Promotion(props: PromotionProps) {
<tbody> <tbody>
{props.students {props.students
.filter((student) => student.promotionId === props.promo.id) .filter((student) => student.promotionId === props.promo.id)
.map((student) => <Student student={student} />)} .map((student) => <Student key={student.id} student={student} />)}
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -104,7 +104,7 @@ export default function UploadStudents() {
return ( return (
<> <>
<input type="file" accept=".xlsx, .xls" onChange={handleFileChange} /> <input type="file" accept=".xlsx, .xls" onChange={handleFileChange} />
<button onClick={confirmUpload}>Confirm Upload</button> <button type="button" onClick={confirmUpload}>Confirm Upload</button>
<p>{statusMessage.value}</p> <p>{statusMessage.value}</p>
</> </>
); );
+2 -2
View File
@@ -92,9 +92,9 @@ export const handler: Handlers<null, AuthenticatedState> = {
using connection = connect("students"); using connection = connect("students");
const database = connection.database; const database = connection.database;
if (context.state.role == "etudiant") { if (context.state.session.eduPersonPrimaryAffiliation == "student") {
return new Response( return new Response(
JSON.stringify(getItself(database, context.state.uid)), JSON.stringify(getItself(database, context.state.session.uid)),
{ {
headers: { headers: {
"content-type": "application/json", "content-type": "application/json",
+7 -1
View File
@@ -8,7 +8,13 @@ import SelfPortrait from "$root/routes/(apps)/students/(_components)/SelfPortrai
// deno-lint-ignore require-await // deno-lint-ignore require-await
export async function Index(_request: Request, context: FreshContext<State>) { export async function Index(_request: Request, context: FreshContext<State>) {
return <h2>Welcome {context.state.displayName || 'Guest'}!</h2>; return (
<>
<h2>Welcome {context.state.session?.givenName}!</h2>
<h3>Your amU identity</h3>
<SelfPortrait self={context.state.session!} />
</>
);
} }
export const config = getPartialsConfig(); export const config = getPartialsConfig();
-12
View File
@@ -1,12 +0,0 @@
import { Head } from "$fresh/runtime.ts";
export default function Error403() {
return (
<>
<Head>
<title>403 - Forbidden</title>
</Head>
<p>403</p>
</>
);
}
+2 -33
View File
@@ -44,7 +44,6 @@ export function getKey(user: string): string {
export const handler: MiddlewareHandler<State>[] = [ export const handler: MiddlewareHandler<State>[] = [
/** /**
* Check if user is authenticated and add session to context accordingly. * Check if user is authenticated and add session to context accordingly.
* Only authenticated users who are members of Polytech are allowed.
* @param request The HTTP incomming request. * @param request The HTTP incomming request.
* @param context The Fresh context object with custom `State`. * @param context The Fresh context object with custom `State`.
* @returns The response from the next middleware. * @returns The response from the next middleware.
@@ -56,7 +55,6 @@ export const handler: MiddlewareHandler<State>[] = [
const cookies = getCookies(request.headers); const cookies = getCookies(request.headers);
if (!cookies["sessionToken"]) { if (!cookies["sessionToken"]) {
context.state.isAuthenticated = false; context.state.isAuthenticated = false;
context.state.isFromPolytech = false;
return await context.next(); return await context.next();
} }
@@ -69,27 +67,9 @@ export const handler: MiddlewareHandler<State>[] = [
); );
if (context.state.isAuthenticated) { if (context.state.isAuthenticated) {
const session: CasContent = const session: CasContent =
(getJwtPayload(cookies["sessionToken"]) as LoginJWT).user; (getJwtPayload(cookies["sessionToken"]) as LoginJWT).user;
context.state.session = session;
const isFromPolytech = session.amuComposante.includes("polytech");
context.state.isFromPolytech = isFromPolytech;
if (isFromPolytech) {
context.state.displayName = session.displayName;
context.state.uid = session.uid;
if (session.eduPersonPrimaryAffiliation == "faculty") {
context.state.role = "professeur"
} else if (session.eduPersonPrimaryAffiliation == "employee") {
context.state.role = "administration"
} else if (session.eduPersonPrimaryAffiliation == "student") {
context.state.role = "etudiant";
} else {
context.state.role = "autre";
}
}
} }
return await context.next(); return await context.next();
@@ -107,8 +87,7 @@ export const handler: MiddlewareHandler<State>[] = [
): Promise<Response> { ): Promise<Response> {
const url = new URL(request.url); const url = new URL(request.url);
if (!isRoutePublic(url.pathname)) { if (!isRoutePublic(url.pathname) && !context.state.isAuthenticated) {
if (!context.state.isAuthenticated) {
return new Response(null, { return new Response(null, {
status: 302, status: 302,
headers: { headers: {
@@ -117,16 +96,6 @@ export const handler: MiddlewareHandler<State>[] = [
}); });
} }
if (!context.state.isFromPolytech) {
return new Response(null, {
status: 403,
headers: {
Location: "/403",
},
});
}
}
return await context.next(); return await context.next();
}, },
]; ];
View File
+56
View File
@@ -0,0 +1,56 @@
// Mock de fetch() pour les tests
// deno-lint-ignore no-explicit-any
let _originalFetch: ((input: any, init?: any) => Promise<Response>) | null =
null;
/**
* Remplace globalThis.fetch par un mock qui retourne des réponses
* pré-configurées selon l'URL.
*
* @param routes - Map URL pattern → données de réponse (sera sérialisé en JSON)
*/
export function mockFetch(
routes: Record<string, unknown>,
): void {
_originalFetch = globalThis.fetch;
globalThis.fetch = (
input: string | URL | Request,
_init?: RequestInit,
): Promise<Response> => {
const url = typeof input === "string"
? input
: input instanceof URL
? input.toString()
: input.url;
for (const [pattern, data] of Object.entries(routes)) {
if (url.includes(pattern)) {
return Promise.resolve(
new Response(JSON.stringify(data), {
status: 200,
headers: { "Content-Type": "application/json" },
}),
);
}
}
return Promise.resolve(
new Response(JSON.stringify({ error: "Not Found" }), {
status: 404,
headers: { "Content-Type": "application/json" },
}),
);
};
}
/**
* Restaure le fetch original.
*/
export function restoreFetch(): void {
if (_originalFetch) {
globalThis.fetch = _originalFetch;
_originalFetch = null;
}
}
+107
View File
@@ -0,0 +1,107 @@
// Types et données de test pour l'API PolyMPR
export interface Student {
numEtud: number;
nom: string;
prenom: string;
idPromo: number;
}
export interface Promotion {
idPromo: number;
annee: string;
}
export interface Prof {
id: number;
nom: string;
prenom: string;
}
export interface Module {
id: number;
nom: string;
}
export interface Note {
note: number;
numEtud: number;
idModule: number;
}
export interface UE {
id: number;
nom: string;
}
export interface UeModule {
idModule: number;
idUE: number;
idPromo: number;
coeff: number;
}
export interface Enseignement {
idProf: number;
idModule: number;
idPromo: number;
}
export interface Ajustement {
numEtud: number;
idUE: number;
valeur: number;
}
// --- Fixtures ---
export const students: Student[] = [
{ numEtud: 1, nom: "Dupont", prenom: "Alice", idPromo: 1 },
{ numEtud: 2, nom: "Martin", prenom: "Bob", idPromo: 1 },
{ numEtud: 3, nom: "Durand", prenom: "Claire", idPromo: 2 },
];
export const promotions: Promotion[] = [
{ idPromo: 1, annee: "2025-2026" },
{ idPromo: 2, annee: "2024-2025" },
];
export const profs: Prof[] = [
{ id: 1, nom: "Leclerc", prenom: "Jean" },
{ id: 2, nom: "Moreau", prenom: "Sophie" },
];
export const modules: Module[] = [
{ id: 1, nom: "Mathématiques" },
{ id: 2, nom: "Informatique" },
{ id: 3, nom: "Physique" },
];
export const notes: Note[] = [
{ note: 15, numEtud: 1, idModule: 1 },
{ note: 12, numEtud: 1, idModule: 2 },
{ note: 18, numEtud: 2, idModule: 1 },
{ note: 9, numEtud: 3, idModule: 3 },
];
export const ues: UE[] = [
{ id: 1, nom: "Sciences fondamentales" },
{ id: 2, nom: "Sciences appliquées" },
];
export const ueModules: UeModule[] = [
{ idModule: 1, idUE: 1, idPromo: 1, coeff: 3 },
{ idModule: 2, idUE: 2, idPromo: 1, coeff: 4 },
{ idModule: 3, idUE: 1, idPromo: 2, coeff: 2 },
];
export const enseignements: Enseignement[] = [
{ idProf: 1, idModule: 1, idPromo: 1 },
{ idProf: 2, idModule: 2, idPromo: 1 },
{ idProf: 1, idModule: 3, idPromo: 2 },
];
export const ajustements: Ajustement[] = [
{ numEtud: 1, idUE: 1, valeur: 0.5 },
{ numEtud: 3, idUE: 1, valeur: -1 },
];
+55
View File
@@ -0,0 +1,55 @@
// Setup happy-dom + wrapper render pour les tests de composants Preact
import { Window } from "happy-dom";
let _window: Window | null = null;
/**
* Initialise un environnement DOM virtuel via happy-dom.
* À appeler avant de rendre des composants Preact dans les tests.
*/
export function setupDOM(): void {
_window = new Window({ url: "http://localhost" });
// Expose les globals DOM nécessaires à Preact
const globals = _window as unknown as Record<string, unknown>;
const target = globalThis as unknown as Record<string, unknown>;
for (
const key of [
"document",
"navigator",
"location",
"HTMLElement",
"HTMLInputElement",
"HTMLTextAreaElement",
"HTMLSelectElement",
"Event",
"CustomEvent",
"KeyboardEvent",
"MouseEvent",
"InputEvent",
"MutationObserver",
"requestAnimationFrame",
"cancelAnimationFrame",
]
) {
target[key] = globals[key];
}
target["window"] = _window;
}
/**
* Nettoie l'environnement DOM.
* À appeler dans un afterEach ou à la fin d'un test.
*/
export function cleanupDOM(): void {
if (_window) {
const doc = _window.document;
doc.body.innerHTML = "";
doc.head.innerHTML = "";
_window.close();
_window = null;
}
}
View File
+61
View File
@@ -0,0 +1,61 @@
import { assertEquals, assertExists } from "@std/assert";
import { mockFetch, restoreFetch } from "../helpers/api_mock.ts";
import { notes, students } from "../helpers/fixtures.ts";
import { cleanupDOM, setupDOM } from "../helpers/render.ts";
Deno.test("fixtures - students have expected shape", () => {
assertEquals(students.length, 3);
assertEquals(students[0].nom, "Dupont");
assertExists(students[0].numEtud);
});
Deno.test("mockFetch - returns mocked data for matching route", async () => {
mockFetch({
"/students": students,
"/notes": notes,
});
try {
const res = await fetch("http://localhost/api/students");
assertEquals(res.status, 200);
const data = await res.json();
assertEquals(data.length, 3);
assertEquals(data[0].nom, "Dupont");
} finally {
restoreFetch();
}
});
Deno.test("mockFetch - returns 404 for unknown routes", async () => {
mockFetch({});
try {
const res = await fetch("http://localhost/api/unknown");
assertEquals(res.status, 404);
} finally {
restoreFetch();
}
});
Deno.test({
name: "happy-dom - document is available after setup",
sanitizeResources: false,
sanitizeOps: false,
fn() {
setupDOM();
try {
const doc = globalThis.document;
assertExists(doc);
const div = doc.createElement("div");
div.textContent = "hello";
doc.body.appendChild(div);
assertEquals(doc.body.textContent, "hello");
} finally {
cleanupDOM();
}
},
});