From bc2e6d35070810515714e5d990f0c20a5552c27e Mon Sep 17 00:00:00 2001 From: Bastien DUMONT <bdumont@grandlyon.com> Date: Wed, 7 Feb 2024 12:15:49 +0000 Subject: [PATCH] test: fix some warnings --- .../ElecHalfHourChart.spec.tsx.snap | 42 +++++++------- src/components/Splash/SplashRoot.spec.tsx | 15 ++++- .../__snapshots__/SplashRoot.spec.tsx.snap | 57 +++++++++++++++++++ src/services/fluidsPrices.service.spec.ts | 2 - tests/__mocks__/chartData.mock.ts | 6 +- 5 files changed, 94 insertions(+), 28 deletions(-) diff --git a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap index 8c4b0ebdc..7ec215c0a 100644 --- a/src/components/Analysis/ElecHalfHourMonthlyAnalysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap +++ b/src/components/Analysis/ElecHalfHourMonthlyAnalysis/__snapshots__/ElecHalfHourChart.spec.tsx.snap @@ -78,20 +78,20 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` <g> <g class="barContainer " - transform="translate(79.09090909090912, -40)" + transform="translate(21.219512195121922, -40)" > <rect class="background-undefined" fill="#E0E0E0" height="180" - width="711.8181818181818" + width="190.97560975609758" x="0" y="0" /> </g> <g class="barFill" - transform="translate(79.09090909090912, 0)" + transform="translate(21.219512195121922, 0)" > <defs> <lineargradient @@ -124,7 +124,7 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` /> </g> <g - transform="translate(79.09090909090912, 0)" + transform="translate(21.219512195121922, 0)" > <defs> <lineargradient @@ -161,20 +161,20 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` <g> <g class="barContainer " - transform="translate(79.09090909090912, -40)" + transform="translate(233.41463414634146, -40)" > <rect class="background-undefined" fill="#E0E0E0" height="180" - width="711.8181818181818" + width="190.97560975609758" x="0" y="0" /> </g> <g class="barFill" - transform="translate(79.09090909090912, 0)" + transform="translate(233.41463414634146, 0)" > <defs> <lineargradient @@ -207,7 +207,7 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` /> </g> <g - transform="translate(79.09090909090912, 0)" + transform="translate(233.41463414634146, 0)" > <defs> <lineargradient @@ -244,20 +244,20 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` <g> <g class="barContainer " - transform="translate(79.09090909090912, -40)" + transform="translate(445.609756097561, -40)" > <rect class="background-undefined" fill="#E0E0E0" height="180" - width="711.8181818181818" + width="190.97560975609758" x="0" y="0" /> </g> <g class="barFill" - transform="translate(79.09090909090912, 0)" + transform="translate(445.609756097561, 0)" > <defs> <lineargradient @@ -290,7 +290,7 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` /> </g> <g - transform="translate(79.09090909090912, 0)" + transform="translate(445.609756097561, 0)" > <defs> <lineargradient @@ -327,20 +327,20 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` <g> <g class="barContainer " - transform="translate(79.09090909090912, -40)" + transform="translate(657.8048780487804, -40)" > <rect class="background-undefined" fill="#E0E0E0" height="180" - width="711.8181818181818" + width="190.97560975609758" x="0" y="0" /> </g> <g class="barFill" - transform="translate(79.09090909090912, 0)" + transform="translate(657.8048780487804, 0)" > <defs> <lineargradient @@ -373,7 +373,7 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` /> </g> <g - transform="translate(79.09090909090912, 0)" + transform="translate(657.8048780487804, 0)" > <defs> <lineargradient @@ -415,12 +415,12 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` <g class="tick" opacity="1" - transform="translate(79.09090909090912, 0)" + transform="translate(21.219512195121922, 0)" > <text class="chart-ticks-y-text" dy="0.71em" - x="355.9090909090909" + x="95.48780487804879" y="10" > <tspan @@ -434,17 +434,17 @@ exports[`ElecHalfHourChart component should be rendered correctly 1`] = ` <g class="tick" opacity="1" - transform="translate(79.09090909090912, 0)" + transform="translate(233.41463414634146, 0)" /> <g class="tick" opacity="1" - transform="translate(79.09090909090912, 0)" + transform="translate(445.609756097561, 0)" /> <g class="tick" opacity="1" - transform="translate(79.09090909090912, 0)" + transform="translate(657.8048780487804, 0)" /> </g> </svg> diff --git a/src/components/Splash/SplashRoot.spec.tsx b/src/components/Splash/SplashRoot.spec.tsx index 0f27dbc19..a948480c9 100644 --- a/src/components/Splash/SplashRoot.spec.tsx +++ b/src/components/Splash/SplashRoot.spec.tsx @@ -1,4 +1,5 @@ -import { render } from '@testing-library/react' +import { render, screen, waitFor } from '@testing-library/react' +import { userEvent } from '@testing-library/user-event' import React from 'react' import { Provider } from 'react-redux' import { createMockEcolyoStore } from 'tests/__mocks__/store' @@ -11,14 +12,24 @@ jest.mock('@sentry/react', () => ({ })) describe('SplashRoot component', () => { + const store = createMockEcolyoStore() it('should be rendered correctly', async () => { - const store = createMockEcolyoStore() const { container } = render( <Provider store={store}> <SplashRoot>children</SplashRoot> </Provider> ) + expect(container).toMatchSnapshot() + }) + it('should render the error screen and click on the reload button', async () => { + const { container } = render( + <Provider store={store}> + <SplashRoot>children</SplashRoot> + </Provider> + ) + await waitFor(() => null, { container }) expect(container).toMatchSnapshot() + await userEvent.click(screen.getByRole('button')) }) }) diff --git a/src/components/Splash/__snapshots__/SplashRoot.spec.tsx.snap b/src/components/Splash/__snapshots__/SplashRoot.spec.tsx.snap index b0bdc3fbd..4addaf3b6 100644 --- a/src/components/Splash/__snapshots__/SplashRoot.spec.tsx.snap +++ b/src/components/Splash/__snapshots__/SplashRoot.spec.tsx.snap @@ -49,3 +49,60 @@ exports[`SplashRoot component should be rendered correctly 1`] = ` </div> </div> `; + +exports[`SplashRoot component should render the error screen and click on the reload button 1`] = ` +<div> + <div + class="splash-root" + style="transition-duration: 1s;" + > + <div + class="splash-content" + > + <div + class="splash-loader" + > + <svg + aria-hidden="true" + class="error styles__icon___23x3R" + height="130" + width="130" + > + <use + xlink:href="#test-file-stub" + /> + </svg> + <span> + Ecolyo + </span> + <div + class="splash-error-text text-20-bold" + > + splashscreen.error_loading + </div> + <div + class="splash-error-text text-18-normal" + > + splashscreen.consent_error + </div> + </div> + </div> + <div + class="splash-footer" + > + <button + aria-label="splashscreen.accessibility.button_reload" + class="MuiButtonBase-root MuiButton-root MuiButton-text btnPrimary splash-footer-button" + tabindex="0" + type="button" + > + <span + class="MuiButton-label" + > + splashscreen.button_reload + </span> + </button> + </div> + </div> +</div> +`; diff --git a/src/services/fluidsPrices.service.spec.ts b/src/services/fluidsPrices.service.spec.ts index a25157e4c..bd7361028 100644 --- a/src/services/fluidsPrices.service.spec.ts +++ b/src/services/fluidsPrices.service.spec.ts @@ -75,8 +75,6 @@ describe('FluidPrices service', () => { } mockClient.query.mockResolvedValueOnce(mockQueryResult) const prices = await fluidPricesService.getAllLastPrices() - console.log('Prix reçus :', prices) - console.log('Prix attendus :', allLastFluidPrices) expect(prices).toStrictEqual(allLastFluidPrices) expect(mockClient.query).toHaveBeenCalled() }) diff --git a/tests/__mocks__/chartData.mock.ts b/tests/__mocks__/chartData.mock.ts index 904a31f3e..470ebe508 100644 --- a/tests/__mocks__/chartData.mock.ts +++ b/tests/__mocks__/chartData.mock.ts @@ -102,7 +102,7 @@ export const dataLoadArray: Dataload[] = [ valueDetail: null, }, { - date: DateTime.fromISO('2021-09-23T00:00:00.000Z', { + date: DateTime.fromISO('2021-09-24T00:00:00.000Z', { zone: 'utc', }), value: 12, @@ -110,7 +110,7 @@ export const dataLoadArray: Dataload[] = [ valueDetail: null, }, { - date: DateTime.fromISO('2021-09-23T00:00:00.000Z', { + date: DateTime.fromISO('2021-09-25T00:00:00.000Z', { zone: 'utc', }), value: 12, @@ -118,7 +118,7 @@ export const dataLoadArray: Dataload[] = [ valueDetail: null, }, { - date: DateTime.fromISO('2021-09-23T00:00:00.000Z', { + date: DateTime.fromISO('2021-09-26T00:00:00.000Z', { zone: 'utc', }), value: 12, -- GitLab