From b499bce69222fa5efcfa049cf53fd1afbc901af9 Mon Sep 17 00:00:00 2001 From: Pyry Koivisto Date: Wed, 17 Jan 2024 22:44:04 +0200 Subject: [PATCH] YKI(Frontend): Lint --- .../integration/exam_details_page.spec.ts | 3 ++- .../page-objects/publicRegistrationPage.ts | 3 +-- .../InitRegistrationPage.test.tsx | 9 ++++++-- .../PublicExamSessionListing.test.tsx | 1 - .../packages/yki/src/tests/msw/handlers.ts | 22 +++++++++---------- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/frontend/packages/yki/src/tests/cypress/integration/exam_details_page.spec.ts b/frontend/packages/yki/src/tests/cypress/integration/exam_details_page.spec.ts index 59eae2e09..e25898e62 100644 --- a/frontend/packages/yki/src/tests/cypress/integration/exam_details_page.spec.ts +++ b/frontend/packages/yki/src/tests/cypress/integration/exam_details_page.spec.ts @@ -1,6 +1,6 @@ import { APIEndpoints } from 'enums/api'; +import { onExamDetailsPage } from 'tests/cypress/support/page-objects/examDetailsPage'; import { examSessions } from 'tests/msw/fixtures/examSession'; -import { onExamDetailsPage } from '../support/page-objects/examDetailsPage'; const examSessionResponse = examSessions.exam_sessions.find( (es) => es.id === 999 @@ -19,6 +19,7 @@ const getInitRegistrationResponse = (is_strongly_identified: boolean) => { if (is_strongly_identified) { const { first_name, last_name, ssn, post_office, zip, street_address } = expectedSuomiFiRegistrationDetails; + return { is_strongly_identified, exam_session: examSessionResponse, diff --git a/frontend/packages/yki/src/tests/cypress/support/page-objects/publicRegistrationPage.ts b/frontend/packages/yki/src/tests/cypress/support/page-objects/publicRegistrationPage.ts index 040cb92db..e14956d81 100644 --- a/frontend/packages/yki/src/tests/cypress/support/page-objects/publicRegistrationPage.ts +++ b/frontend/packages/yki/src/tests/cypress/support/page-objects/publicRegistrationPage.ts @@ -4,8 +4,7 @@ class PublicRegistrationPage { elements = { filterByLanguage: () => cy.findByRole('combobox', { name: /Valitse kieli/ }), - filterByLevel: () => - cy.findByRole('combobox', { name: /Valitse taso/ }), + filterByLevel: () => cy.findByRole('combobox', { name: /Valitse taso/ }), resultBox: () => cy.findByTestId('public-registration-page__grid-container__result-box'), showOnlyIfAvailablePlaces: () => diff --git a/frontend/packages/yki/src/tests/jest/components/registration/InitRegistrationPage.test.tsx b/frontend/packages/yki/src/tests/jest/components/registration/InitRegistrationPage.test.tsx index f6798da68..5ba4ad12d 100644 --- a/frontend/packages/yki/src/tests/jest/components/registration/InitRegistrationPage.test.tsx +++ b/frontend/packages/yki/src/tests/jest/components/registration/InitRegistrationPage.test.tsx @@ -1,5 +1,6 @@ -import { create } from 'react-test-renderer'; import { PreloadedState } from '@reduxjs/toolkit'; +import { create } from 'react-test-renderer'; +import { APIResponseStatus } from 'shared/enums'; import { RootState } from 'configs/redux'; import { RegistrationKind } from 'enums/app'; @@ -8,7 +9,6 @@ import { ContentSelector } from 'pages/InitRegistrationPage'; import { initialState as initialRegistrationState } from 'redux/reducers/registration'; import { DefaultProviders } from 'tests/jest/utils/DefaultProviders'; import { examSessions } from 'tests/msw/fixtures/examSession'; -import { APIResponseStatus } from 'shared/enums'; import { ExamSessionUtils } from 'utils/examSession'; import { SerializationUtils } from 'utils/serialization'; @@ -25,6 +25,7 @@ const renderPageWithSession = (examSession: ExamSession) => { ).toJSON(); + return tree; }; @@ -39,6 +40,7 @@ describe('InitRegistrationPage', () => { const examSession = sessions.find((es) => { const { open, kind, availablePlaces } = ExamSessionUtils.getEffectiveRegistrationPeriodDetails(es); + return ( open && kind === RegistrationKind.Admission && availablePlaces > 0 ); @@ -51,6 +53,7 @@ describe('InitRegistrationPage', () => { const examSession = sessions.find((es) => { const { open, kind, availablePlaces } = ExamSessionUtils.getEffectiveRegistrationPeriodDetails(es); + return ( open && kind === RegistrationKind.PostAdmission && availablePlaces > 0 ); @@ -65,6 +68,7 @@ describe('InitRegistrationPage', () => { const examSession = sessions.find((es) => { const { open, availablePlaces, availableQueue } = ExamSessionUtils.getEffectiveRegistrationPeriodDetails(es); + return open && availablePlaces === 0 && availableQueue; }) as ExamSession; const tree = renderPageWithSession(examSession); @@ -77,6 +81,7 @@ describe('InitRegistrationPage', () => { const examSession = sessions.find((es) => { const { open, availablePlaces, availableQueue } = ExamSessionUtils.getEffectiveRegistrationPeriodDetails(es); + return open && availablePlaces === 0 && !availableQueue; }) as ExamSession; const tree = renderPageWithSession(examSession); diff --git a/frontend/packages/yki/src/tests/jest/components/registration/examSession/PublicExamSessionListing.test.tsx b/frontend/packages/yki/src/tests/jest/components/registration/examSession/PublicExamSessionListing.test.tsx index e006033fd..2d2d0abd9 100644 --- a/frontend/packages/yki/src/tests/jest/components/registration/examSession/PublicExamSessionListing.test.tsx +++ b/frontend/packages/yki/src/tests/jest/components/registration/examSession/PublicExamSessionListing.test.tsx @@ -1,4 +1,3 @@ -import dayjs from 'dayjs'; import { Provider } from 'react-redux'; import { BrowserRouter } from 'react-router-dom'; import renderer from 'react-test-renderer'; diff --git a/frontend/packages/yki/src/tests/msw/handlers.ts b/frontend/packages/yki/src/tests/msw/handlers.ts index e7ba77060..4afc62de6 100644 --- a/frontend/packages/yki/src/tests/msw/handlers.ts +++ b/frontend/packages/yki/src/tests/msw/handlers.ts @@ -4,8 +4,8 @@ import { APIEndpoints } from 'enums/api'; import { evaluationOrderPostResponse } from 'tests/msw/fixtures/evaluationOrder'; import { evaluationPeriods } from 'tests/msw/fixtures/evaluationPeriods'; import { examSessions } from 'tests/msw/fixtures/examSession'; -import { maatJaValtiot2Response } from './fixtures/maatjavaltiot2'; -import { SuomiFiAuthenticatedSessionResponse } from './fixtures/identity'; +import { SuomiFiAuthenticatedSessionResponse } from 'tests/msw/fixtures/identity'; +import { maatJaValtiot2Response } from 'tests/msw/fixtures/maatjavaltiot2'; const notFound = () => new HttpResponse(null, { status: 404 }); @@ -39,15 +39,15 @@ export const handlers = [ return notFound(); } }), - http.get(APIEndpoints.User, () => { - return HttpResponse.json(SuomiFiAuthenticatedSessionResponse); - }), - http.post(APIEndpoints.EvaluationOrder, () => { - return HttpResponse.json(evaluationOrderPostResponse); - }), - http.get(APIEndpoints.CountryCodes, () => { - return HttpResponse.json(maatJaValtiot2Response); - }), + http.get(APIEndpoints.User, () => + HttpResponse.json(SuomiFiAuthenticatedSessionResponse) + ), + http.post(APIEndpoints.EvaluationOrder, () => + HttpResponse.json(evaluationOrderPostResponse) + ), + http.get(APIEndpoints.CountryCodes, () => + HttpResponse.json(maatJaValtiot2Response) + ), http.post(APIEndpoints.SubmitRegistration, () => { return HttpResponse.json({ success: true }); }),