From a9a1563405927d728f4c883ab664d0f84d68800f Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Tue, 31 Mar 2026 17:08:28 +0000 Subject: [PATCH 01/10] feat: add solid testing infrastructure (endpoints.env, run-e2e-tests.sh, entities.test.js) --- client/shared | 2 +- client/src/entities.test.js | 34 +++++++++++ server/helpers/endpoints.env | 1 + server/helpers/test-all-endpoints.sh | 87 ---------------------------- server/scripts/run-e2e-tests.sh | 6 ++ server/shared | 2 +- 6 files changed, 43 insertions(+), 89 deletions(-) create mode 100644 client/src/entities.test.js create mode 100644 server/helpers/endpoints.env delete mode 100755 server/helpers/test-all-endpoints.sh create mode 100644 server/scripts/run-e2e-tests.sh diff --git a/client/shared b/client/shared index 7f47c572..51bf7de5 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 7f47c5721120572a43bd577d2c26cb10cbf5e1be +Subproject commit 51bf7de503760dd7a2ca211b110dc66aeec304c2 diff --git a/client/src/entities.test.js b/client/src/entities.test.js new file mode 100644 index 00000000..b3baab3f --- /dev/null +++ b/client/src/entities.test.js @@ -0,0 +1,34 @@ +// entities.test.js +// Smoke-tests every React Admin resource page in this app. +// Adding a new to App.jsx automatically gets tested — no edits needed here. + +// These mocks MUST be in this file (not in createResourceTests) because +// jest.mock() calls are hoisted to the top of the file by Babel. + +jest.mock('@shared/providers/dataProvider', () => ({ + getList: () => Promise.resolve({ data: [], total: 0 }), + getOne: () => Promise.resolve({ data: {} }), + getMany: () => Promise.resolve({ data: [] }), + getManyReference: () => Promise.resolve({ data: [], total: 0 }), + create: () => Promise.resolve({ data: {} }), + update: () => Promise.resolve({ data: {} }), + updateMany: () => Promise.resolve({ data: [] }), + delete: () => Promise.resolve({ data: {} }), + deleteMany: () => Promise.resolve({ data: [] }), +})); + +jest.mock('@shared/providers/authProvider', () => ({ + checkAuth: () => Promise.resolve(), + // Return { admin: true } so permissionsUtil.isAdmin() returns true, + // which gates the admin view and shows all resources in the sidebar. + getPermissions: () => Promise.resolve({ admin: true }), + getIdentity: () => Promise.resolve({ id: 1, fullName: 'Test User' }), + login: () => Promise.resolve(), + logout: () => Promise.resolve(), + checkError: () => Promise.resolve(), +})); + +import App from './App'; +import { createResourceTests } from '@shared/utils/testing/createResourceTests'; + +createResourceTests(App); diff --git a/server/helpers/endpoints.env b/server/helpers/endpoints.env new file mode 100644 index 00000000..b80029bf --- /dev/null +++ b/server/helpers/endpoints.env @@ -0,0 +1 @@ +ENDPOINTS="user att_report att_report_with_report_month grade klass klass_type known_absence lesson student_klass student teacher text student_klass_report student_base_klass student_speciality audit_log import_file report_group report_group_session yemot_call mail_address recieved_mail page report_month teacher_report_status teacher_grade_report_status text_by_user student_percent_report att_report_and_grade student_global_report image student_by_year payment_track teacher_salary_report known_absence_with_report_month grade_name attendance_name att_grade_effect grade_effect_by_user abs_count_effect_by_user lesson_klass_name" diff --git a/server/helpers/test-all-endpoints.sh b/server/helpers/test-all-endpoints.sh deleted file mode 100755 index eefa5e58..00000000 --- a/server/helpers/test-all-endpoints.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -# Test script for all entity endpoints -# This script tests GET requests to all registered entities in entities.module.ts - -# Backend URL -BACKEND_URL="${BACKEND_URL:-http://localhost:3001}" - -# Admin credentials (should be provided via environment variables) -# Default values are for the template .env.template file -USERNAME="${ADMIN_USER%%:*}" -PASSWORD="${ADMIN_USER#*:}" - -# Fallback to defaults if ADMIN_USER is not set (for backward compatibility) -if [ -z "$USERNAME" ]; then - USERNAME="${USERNAME:-admin_user}" - PASSWORD="${PASSWORD:-admin_password}" -fi - -echo "============================================" -echo "API Endpoints Test - $(date)" -echo "============================================" -echo "" - -# Login and get cookies -echo "Logging in..." -LOGIN_RESPONSE=$(curl -X POST -H "Content-Type: application/json" \ - -d "{\"username\":\"$USERNAME\",\"password\":\"$PASSWORD\"}" \ - -c /tmp/cookies.txt -s "$BACKEND_URL/auth/login") - -if echo "$LOGIN_RESPONSE" | grep -q "true"; then - echo "✓ Login successful" -else - echo "✗ Login failed: $LOGIN_RESPONSE" - exit 1 -fi - -echo "" -echo "Testing entity endpoints..." -echo "" - -# List of all entity endpoints (convert camelCase to snake_case) -# Note: "recieved_mail" spelling is intentional - matches entity name in codebase -ENDPOINTS="user att_report att_report_with_report_month grade klass klass_type known_absence lesson student_klass student teacher text student_klass_report student_base_klass student_speciality audit_log import_file report_group report_group_session yemot_call mail_address recieved_mail page report_month teacher_report_status teacher_grade_report_status text_by_user student_percent_report att_report_and_grade student_global_report image student_by_year payment_track teacher_salary_report known_absence_with_report_month grade_name attendance_name att_grade_effect grade_effect_by_user abs_count_effect_by_user lesson_klass_name" - -# Track results -PASSED=0 -FAILED=0 -ERRORS="" - -# Test each endpoint -for ENDPOINT in $ENDPOINTS; do - printf "Testing %-40s ... " "$ENDPOINT" - - HTTP_CODE=$(curl -b /tmp/cookies.txt -s -o /tmp/response.json -w "%{http_code}" "$BACKEND_URL/$ENDPOINT") - - if [ "$HTTP_CODE" = "200" ]; then - echo "✓ OK (HTTP $HTTP_CODE)" - PASSED=$((PASSED + 1)) - else - echo "✗ FAILED (HTTP $HTTP_CODE)" - FAILED=$((FAILED + 1)) - - # Save error details - ERRORS="$ERRORS -======================================== -Endpoint: $ENDPOINT -HTTP Code: $HTTP_CODE -Response: $(cat /tmp/response.json) -" - fi -done - -echo "" -echo "============================================" -echo "Summary:" -echo " Passed: $PASSED" -echo " Failed: $FAILED" -echo "============================================" - -if [ $FAILED -gt 0 ]; then - echo "" - echo "Error details:" - echo "$ERRORS" -fi - -exit $FAILED \ No newline at end of file diff --git a/server/scripts/run-e2e-tests.sh b/server/scripts/run-e2e-tests.sh new file mode 100644 index 00000000..0f0ceb65 --- /dev/null +++ b/server/scripts/run-e2e-tests.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# Runs curl-based endpoint smoke tests against a running backend. +# Requires BACKEND_URL and ADMIN_USER env vars, or uses defaults. +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +. "$SCRIPT_DIR/../helpers/endpoints.env" +exec "$SCRIPT_DIR/../shared/utils/testing/test-all-endpoints-runner.sh" diff --git a/server/shared b/server/shared index becee2b3..ef153217 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit becee2b3d6ab8c9a13f1fdc1a07a66ad1d0daaca +Subproject commit ef153217328493e45d2cda5982a930ad0fd20322 From 2960fca6ae081ccf7f5f60a123a890b61ce64dcf Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Tue, 31 Mar 2026 17:36:15 +0000 Subject: [PATCH 02/10] refactor: move provider mocks to shared; simplify entities.test.js to 3 lines --- client/shared | 2 +- client/src/entities.test.js | 33 ++------------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) diff --git a/client/shared b/client/shared index 51bf7de5..883e7d38 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 51bf7de503760dd7a2ca211b110dc66aeec304c2 +Subproject commit 883e7d388a19d5cd0f5cc16aaa73d8f51b7d2e30 diff --git a/client/src/entities.test.js b/client/src/entities.test.js index b3baab3f..44901f63 100644 --- a/client/src/entities.test.js +++ b/client/src/entities.test.js @@ -1,34 +1,5 @@ -// entities.test.js -// Smoke-tests every React Admin resource page in this app. -// Adding a new to App.jsx automatically gets tested — no edits needed here. - -// These mocks MUST be in this file (not in createResourceTests) because -// jest.mock() calls are hoisted to the top of the file by Babel. - -jest.mock('@shared/providers/dataProvider', () => ({ - getList: () => Promise.resolve({ data: [], total: 0 }), - getOne: () => Promise.resolve({ data: {} }), - getMany: () => Promise.resolve({ data: [] }), - getManyReference: () => Promise.resolve({ data: [], total: 0 }), - create: () => Promise.resolve({ data: {} }), - update: () => Promise.resolve({ data: {} }), - updateMany: () => Promise.resolve({ data: [] }), - delete: () => Promise.resolve({ data: {} }), - deleteMany: () => Promise.resolve({ data: [] }), -})); - -jest.mock('@shared/providers/authProvider', () => ({ - checkAuth: () => Promise.resolve(), - // Return { admin: true } so permissionsUtil.isAdmin() returns true, - // which gates the admin view and shows all resources in the sidebar. - getPermissions: () => Promise.resolve({ admin: true }), - getIdentity: () => Promise.resolve({ id: 1, fullName: 'Test User' }), - login: () => Promise.resolve(), - logout: () => Promise.resolve(), - checkError: () => Promise.resolve(), -})); - -import App from './App'; +// Smoke-tests every React Admin resource page. Add a to App.jsx and it's auto-tested. import { createResourceTests } from '@shared/utils/testing/createResourceTests'; +import App from './App'; createResourceTests(App); From d3afe060a7f26c59fff96ceab75d1635020d81de Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Tue, 31 Mar 2026 18:30:54 +0000 Subject: [PATCH 03/10] refactor: move entities.test.js into shared module; delete per-project copy --- client/shared | 2 +- client/src/entities.test.js | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 client/src/entities.test.js diff --git a/client/shared b/client/shared index 883e7d38..069a5c9e 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 883e7d388a19d5cd0f5cc16aaa73d8f51b7d2e30 +Subproject commit 069a5c9e8a7d6678038dc48265cec853d65588f6 diff --git a/client/src/entities.test.js b/client/src/entities.test.js deleted file mode 100644 index 44901f63..00000000 --- a/client/src/entities.test.js +++ /dev/null @@ -1,5 +0,0 @@ -// Smoke-tests every React Admin resource page. Add a to App.jsx and it's auto-tested. -import { createResourceTests } from '@shared/utils/testing/createResourceTests'; -import App from './App'; - -createResourceTests(App); From ec2fd8c5bbb77c15e709032b1ecd16024bb91ee9 Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Tue, 31 Mar 2026 18:38:42 +0000 Subject: [PATCH 04/10] refactor: move run-e2e-tests.sh into shared; delete per-project server/scripts/ --- server/scripts/run-e2e-tests.sh | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 server/scripts/run-e2e-tests.sh diff --git a/server/scripts/run-e2e-tests.sh b/server/scripts/run-e2e-tests.sh deleted file mode 100644 index 0f0ceb65..00000000 --- a/server/scripts/run-e2e-tests.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Runs curl-based endpoint smoke tests against a running backend. -# Requires BACKEND_URL and ADMIN_USER env vars, or uses defaults. -SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -. "$SCRIPT_DIR/../helpers/endpoints.env" -exec "$SCRIPT_DIR/../shared/utils/testing/test-all-endpoints-runner.sh" From 5490a8d9e8a80fed0f8e2a09004ad5b8814dfa30 Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Tue, 31 Mar 2026 19:53:25 +0000 Subject: [PATCH 05/10] chore: update nra-server submodule to latest (run-e2e-tests.sh added) --- server/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/shared b/server/shared index ef153217..5d51d8ad 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit ef153217328493e45d2cda5982a930ad0fd20322 +Subproject commit 5d51d8add298622eda7e5304f2e25c8fdd1a2f51 From 310a152cf987f71ce18616127d70584580524c08 Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Tue, 31 Mar 2026 20:28:16 +0000 Subject: [PATCH 06/10] chore: update nra-client submodule (CommonRoutes smoke tests) --- client/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/shared b/client/shared index 069a5c9e..a0cd74f7 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit 069a5c9e8a7d6678038dc48265cec853d65588f6 +Subproject commit a0cd74f7b4e7b379e4bc9cc3897f77581efe743d From 4c4c62e382c7cbd67bbad7ebc9c2dc26fd5dafd9 Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Wed, 1 Apr 2026 09:55:57 +0000 Subject: [PATCH 07/10] test(entity-modules): add config specs for all untested entity configs New specs using createEntityConfigTests: absenceType, known-absence, lesson, report-group, report-group-session, student-klass-report, teacher-grade-report-status, teacher-salary-report, transportation Also bumps nra-server submodule to include entity-config-tester.ts. --- server/shared | 2 +- .../__tests__/absenceType.config.spec.ts | 11 +++++++++ .../__tests__/known-absence.config.spec.ts | 21 +++++++++++++++++ .../__tests__/lesson.config.spec.ts | 19 +++++++++++++++ .../report-group-session.config.spec.ts | 12 ++++++++++ .../__tests__/report-group.config.spec.ts | 23 +++++++++++++++++++ .../student-klass-report.config.spec.ts | 17 ++++++++++++++ ...teacher-grade-report-status.config.spec.ts | 11 +++++++++ .../teacher-salary-report.config.spec.ts | 23 +++++++++++++++++++ .../__tests__/transportation.config.spec.ts | 11 +++++++++ 10 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 server/src/entity-modules/__tests__/absenceType.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/known-absence.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/lesson.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/report-group-session.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/report-group.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/student-klass-report.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/teacher-grade-report-status.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts create mode 100644 server/src/entity-modules/__tests__/transportation.config.spec.ts diff --git a/server/shared b/server/shared index 5d51d8ad..5916c312 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 5d51d8add298622eda7e5304f2e25c8fdd1a2f51 +Subproject commit 5916c312488d8f3758e41e79ddb99ea496cc1a09 diff --git a/server/src/entity-modules/__tests__/absenceType.config.spec.ts b/server/src/entity-modules/__tests__/absenceType.config.spec.ts new file mode 100644 index 00000000..49f2f985 --- /dev/null +++ b/server/src/entity-modules/__tests__/absenceType.config.spec.ts @@ -0,0 +1,11 @@ +import { AbsenceType } from 'src/db/entities/AbsenceType.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../absenceType.config'; + +createEntityConfigTests('AbsenceTypeConfig', config, { + entity: AbsenceType, + expectedExportHeaders: { + count: 4, + first: { value: 'name', label: 'סוג חיסור' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/known-absence.config.spec.ts b/server/src/entity-modules/__tests__/known-absence.config.spec.ts new file mode 100644 index 00000000..4dfa0f6c --- /dev/null +++ b/server/src/entity-modules/__tests__/known-absence.config.spec.ts @@ -0,0 +1,21 @@ +import { KnownAbsence } from 'src/db/entities/KnownAbsence.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../known-absence.config'; + +createEntityConfigTests('KnownAbsenceConfig', config, { + entity: KnownAbsence, + expectedJoins: { + student: { eager: false }, + lesson: { eager: false }, + klass: { eager: false }, + absenceType: { eager: false }, + }, + expectedExportJoins: { + student: { eager: true }, + absenceType: { eager: true }, + }, + expectedExportHeaders: { + count: 11, + first: { value: 'student.name', label: 'תלמידה' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/lesson.config.spec.ts b/server/src/entity-modules/__tests__/lesson.config.spec.ts new file mode 100644 index 00000000..80fb9c95 --- /dev/null +++ b/server/src/entity-modules/__tests__/lesson.config.spec.ts @@ -0,0 +1,19 @@ +import { Lesson } from 'src/db/entities/Lesson.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../lesson.config'; + +createEntityConfigTests('LessonConfig', config, { + entity: Lesson, + expectedJoins: { + teacher: { eager: false }, + lessonKlassName: { eager: false }, + }, + expectedExportJoins: { + teacher: { eager: true }, + lessonKlassName: { eager: true }, + }, + expectedExportHeaders: { + count: 7, + first: { value: 'key', label: 'מזהה' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/report-group-session.config.spec.ts b/server/src/entity-modules/__tests__/report-group-session.config.spec.ts new file mode 100644 index 00000000..d523c54c --- /dev/null +++ b/server/src/entity-modules/__tests__/report-group-session.config.spec.ts @@ -0,0 +1,12 @@ +import { ReportGroupSession } from 'src/db/entities/ReportGroupSession.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../report-group-session.config'; + +createEntityConfigTests('ReportGroupSessionConfig', config, { + entity: ReportGroupSession, + expectedJoins: { + reportGroup: { eager: false }, + attReports: { eager: false }, + grades: { eager: false }, + }, +}); diff --git a/server/src/entity-modules/__tests__/report-group.config.spec.ts b/server/src/entity-modules/__tests__/report-group.config.spec.ts new file mode 100644 index 00000000..eb2c6a1e --- /dev/null +++ b/server/src/entity-modules/__tests__/report-group.config.spec.ts @@ -0,0 +1,23 @@ +import { ReportGroup } from 'src/db/entities/ReportGroup.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../report-group.config'; + +createEntityConfigTests('ReportGroupConfig', config, { + entity: ReportGroup, + expectedJoins: { + teacher: { eager: false }, + lesson: { eager: false }, + klass: { eager: false }, + sessions: { eager: false }, + }, + expectedExportJoins: { + teacher: { eager: true }, + lesson: { eager: true }, + klass: { eager: true }, + sessions: { eager: true }, + }, + expectedExportHeaders: { + count: 8, + first: { value: 'name', label: 'שם' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/student-klass-report.config.spec.ts b/server/src/entity-modules/__tests__/student-klass-report.config.spec.ts new file mode 100644 index 00000000..28493dbf --- /dev/null +++ b/server/src/entity-modules/__tests__/student-klass-report.config.spec.ts @@ -0,0 +1,17 @@ +import { StudentKlassReport } from 'src/db/view-entities/StudentKlassReport.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../student-klass-report.config'; + +createEntityConfigTests('StudentKlassReportConfig', config, { + entity: StudentKlassReport, + expectedJoins: { + student: { eager: false }, + }, + expectedExportJoins: { + student: { eager: true }, + }, + expectedExportHeaders: { + count: 10, + first: { value: 'student.tz', label: 'תז' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/teacher-grade-report-status.config.spec.ts b/server/src/entity-modules/__tests__/teacher-grade-report-status.config.spec.ts new file mode 100644 index 00000000..b24626ba --- /dev/null +++ b/server/src/entity-modules/__tests__/teacher-grade-report-status.config.spec.ts @@ -0,0 +1,11 @@ +import { TeacherGradeReportStatus } from 'src/db/view-entities/TeacherGradeReportStatus.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../teacher-grade-report-status.config'; + +createEntityConfigTests('TeacherGradeReportStatusConfig', config, { + entity: TeacherGradeReportStatus, + expectedExportHeaders: { + count: 4, + first: { value: 'teacherName', label: 'מורה' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts b/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts new file mode 100644 index 00000000..901c43bb --- /dev/null +++ b/server/src/entity-modules/__tests__/teacher-salary-report.config.spec.ts @@ -0,0 +1,23 @@ +import { TeacherSalaryReport } from 'src/db/view-entities/TeacherSalaryReport.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../teacher-salary-report.config'; + +createEntityConfigTests('TeacherSalaryReportConfig', config, { + entity: TeacherSalaryReport, + expectedJoins: { + teacher: {}, + lesson: {}, + klass: {}, + reportMonth: {}, + }, + expectedExportJoins: { + teacher: { eager: true }, + klass: { eager: true }, + lesson: { eager: true }, + reportMonth: { eager: true }, + }, + expectedExportHeaders: { + count: 6, + first: { value: 'teacher.name', label: 'שם המורה' }, + }, +}); diff --git a/server/src/entity-modules/__tests__/transportation.config.spec.ts b/server/src/entity-modules/__tests__/transportation.config.spec.ts new file mode 100644 index 00000000..b953fded --- /dev/null +++ b/server/src/entity-modules/__tests__/transportation.config.spec.ts @@ -0,0 +1,11 @@ +import { Transportation } from 'src/db/entities/Transportation.entity'; +import { createEntityConfigTests } from '@shared/utils/testing/entity-config-tester'; +import config from '../transportation.config'; + +createEntityConfigTests('TransportationConfig', config, { + entity: Transportation, + expectedExportHeaders: { + count: 4, + first: { value: 'key', label: 'שילוט' }, + }, +}); From 54a04e6f47e118b11ae0da3145a0ed86503deb1d Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Sun, 26 Apr 2026 19:19:23 +0000 Subject: [PATCH 08/10] chore: bump shared submodules to post-merge main HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - server/shared (nra-server): 2f339e0 — after feature/solid-testing merge - client/shared (nra-client): 9276a7e — after feature/solid-testing merge --- client/shared | 2 +- server/shared | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/shared b/client/shared index a0cd74f7..9276a7ea 160000 --- a/client/shared +++ b/client/shared @@ -1 +1 @@ -Subproject commit a0cd74f7b4e7b379e4bc9cc3897f77581efe743d +Subproject commit 9276a7eaa68f99fd88152dd7c845ae0ecf574899 diff --git a/server/shared b/server/shared index 5916c312..2f339e04 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 5916c312488d8f3758e41e79ddb99ea496cc1a09 +Subproject commit 2f339e04741a7c1f3ab976c1c4a6e352125c1cbe From 1d6865af2d32e8523c4cb6d73f661efb3107e6a6 Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Sun, 26 Apr 2026 19:22:42 +0000 Subject: [PATCH 09/10] fix: add missing endpoints to e2e smoke test list Add transportation, absence_type, uploaded_file which are registered in EntitiesModule but were missing from the ENDPOINTS list. --- server/helpers/endpoints.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/helpers/endpoints.env b/server/helpers/endpoints.env index b80029bf..123ccd5c 100644 --- a/server/helpers/endpoints.env +++ b/server/helpers/endpoints.env @@ -1 +1 @@ -ENDPOINTS="user att_report att_report_with_report_month grade klass klass_type known_absence lesson student_klass student teacher text student_klass_report student_base_klass student_speciality audit_log import_file report_group report_group_session yemot_call mail_address recieved_mail page report_month teacher_report_status teacher_grade_report_status text_by_user student_percent_report att_report_and_grade student_global_report image student_by_year payment_track teacher_salary_report known_absence_with_report_month grade_name attendance_name att_grade_effect grade_effect_by_user abs_count_effect_by_user lesson_klass_name" +ENDPOINTS="user att_report att_report_with_report_month grade klass klass_type known_absence lesson student_klass student teacher text student_klass_report student_base_klass student_speciality audit_log import_file report_group report_group_session yemot_call mail_address recieved_mail page report_month teacher_report_status teacher_grade_report_status text_by_user student_percent_report att_report_and_grade student_global_report image student_by_year payment_track teacher_salary_report known_absence_with_report_month grade_name attendance_name att_grade_effect grade_effect_by_user abs_count_effect_by_user lesson_klass_name transportation absence_type uploaded_file" From 98978ab060930368b87e11822cd94d2e1006b12d Mon Sep 17 00:00:00 2001 From: Hadasa Schechter <72219643+buzz-code@users.noreply.github.com> Date: Sun, 26 Apr 2026 20:02:07 +0000 Subject: [PATCH 10/10] fix: update e2e test to match updated AppService response AppService.getHello() now returns 'Hello World! Server started at '. Update the e2e assertion to use a regex pattern, matching the existing unit test assertions in app.service.spec.ts and app.controller.spec.ts. --- server/test/app.e2e-spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/test/app.e2e-spec.ts b/server/test/app.e2e-spec.ts index fd834eb6..715c07bc 100644 --- a/server/test/app.e2e-spec.ts +++ b/server/test/app.e2e-spec.ts @@ -27,7 +27,7 @@ describe('AppController (e2e)', () => { return request(app.getHttpServer()) .get('/') .expect(200) - .expect('Hello World!'); + .expect(/^Hello World! Server started at /); }); it('should use SQLite in-memory database for E2E tests', () => {