iritmaximus/oodikone
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/oodikone.git synced 2026-10-12 19:03:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

[E2E][LanguageCenterView] Try to make data more deterministic

Browse Source
This commit is contained in:
Aaro Koivukangas
2026-09-21 15:24:21 +03:00
committed by Aaro Koivukangas
parent 81768930af
commit facac78e8c
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e/Language_center.spec.ts
+5 -4
View File
@@ -4,7 +4,8 @@ import { init } from './support/commands'
const chooseSemester = async (page: Page, semester: string, fromOrTo: 'from' | 'to') => {
await page.getByTestId(`semester-${fromOrTo}`).click()
await page.getByTestId(`select-opt-${semester}`).click()
await expect(page.getByTestId(`select-opt-${semester}`)).not.toHaveClass(/visible/)
// The dropdown unmounts its options on close, so wait for it to be gone before reading the table
await expect(page.getByRole('listbox')).toHaveCount(0)
}
const checkNumbers = async (page: Page, numbers: number[], numberOfColumns: number, mode: string) => {
@@ -37,7 +38,7 @@ test.describe('When language center is opened', () => {
})
test('Faculties tab shows numbers', async ({ page }) => {
await checkNumbers(page, [2076, 36, 9, 34, 759, 15, 40, 6, 51, 1, 24, 1059, 42, 0], 15, 'faculties')
await checkNumbers(page, [2074, 36, 9, 33, 758, 15, 40, 6, 51, 1, 24, 1059, 42, 0], 15, 'faculties')
})
test('Faculties tab "exceeding" button works', async ({ page }) => {
@@ -47,7 +48,7 @@ test.describe('When language center is opened', () => {
test('Faculties tab semester selector changes numbers', async ({ page }) => {
await chooseSemester(page, 'Syksy 2020', 'from')
await checkNumbers(page, [1184, 28, 6, 28, 499, 4, 10, 2, 36, 0, 9, 535, 27, 0], 15, 'faculties')
await checkNumbers(page, [1182, 28, 6, 27, 498, 4, 10, 2, 36, 0, 9, 535, 27, 0], 15, 'faculties')
})
})
@@ -59,7 +60,7 @@ test.describe('When language center is opened', () => {
})
test('Semester tab shows numbers', async ({ page }) => {
await checkNumbers(page, [2076, 69, 26, 298, 58, 343, 98, 438, 138, 310, 90, 123, 74, 10, 1], 16, 'semesters')
await checkNumbers(page, [2074, 69, 26, 298, 58, 343, 98, 437, 138, 310, 90, 123, 73, 10, 1], 16, 'semesters')
})
})
})
services/backend/src/services/languageCenterData.ts
+7 -1
View File
@@ -131,6 +131,7 @@ export const computeLanguageCenterData = async () => {
semestercode: { [Op.gte]: autumnSemester2017 },
credittypecode: 4,
},
order: [['attainment_date', 'DESC']],
})
const enrollments = await EnrollmentModel.findAll({
@@ -141,11 +142,16 @@ export const computeLanguageCenterData = async () => {
state: { [Op.in]: ['ENROLLED', 'REJECTED'] },
// EnrollmentDateTimeThreshold need not be used here as we are not counting failed courses
},
order: [['enrollment_date_time', 'DESC']],
})
const studyRights = await SISStudyRightModel.findAll({
raw: true,
order: [['end_date', 'DESC NULLS LAST']],
order: [
['end_date', 'DESC NULLS LAST'],
['start_date', 'DESC'],
['id', 'DESC'],
],
})
const attemptStudyRightToFacultyMap = studyRights.reduce<