front: adapt e2e tests to use tsv2

- e2e tests are now using tsv2 model
- remove allowances e2e tests as they are deprecated
- rolling stock comfort type properly uses tsv2 model

Author: SharglutDev

front/src/modules/rollingStock/components/RollingStockCard/RollingStockCardButtons.tsx

@@ -3,7 +3,7 @@ import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
 
-import type { TrainScheduleBase } from 'common/api/osrdEditoastApi';
+import type { Comfort } from 'common/api/osrdEditoastApi';
 import { ModalContext } from 'common/BootstrapSNCF/ModalSNCF/ModalProvider';
 import OptionsSNCF from 'common/BootstrapSNCF/OptionsSNCF';
 import type { Option } from 'common/BootstrapSNCF/OptionsSNCF';
@@ -35,11 +35,7 @@ const RollingStockCardButtons = ({
   const selectRollingStock = () => {
     setOpenedRollingStockCardId(undefined);
     dispatch(updateRollingStockID(id));
-    dispatch(
-      updateRollingStockComfortV2(
-        comfort !== 'AC' ? (comfort as TrainScheduleBase['comfort']) : 'AIR_CONDITIONING'
-      )
-    );
+    dispatch(updateRollingStockComfortV2(comfort as Comfort));
     closeModal();
   };
 
@@ -63,7 +59,7 @@ const RollingStockCardButtons = ({
         value: 'AC',
         label: (
           <span data-testid="comfort-ac-button" className="rollingstock-footer-button-with-picto">
-            {comfort2pictogram('AC')} {t('comfortTypes.AC')}
+            {comfort2pictogram('AIR_CONDITIONING')} {t('comfortTypes.AC')}
           </span>
         ),
       });

front/src/modules/rollingStock/components/RollingStockSelector/RollingStockHelpers.tsx

@@ -4,11 +4,7 @@ import { BiLockAlt } from 'react-icons/bi';
 import { ImFire } from 'react-icons/im';
 import { IoIosSnow } from 'react-icons/io';
 
-import type {
-  LightRollingStock,
-  RollingStockComfortType,
-  RollingStock,
-} from 'common/api/osrdEditoastApi';
+import type { LightRollingStock, RollingStock, Comfort } from 'common/api/osrdEditoastApi';
 
 const RollingStockUnit = ({ unit, detail }: { unit: string; detail: string }) => {
   if (unit && unit !== 'US') {
@@ -73,9 +69,9 @@ export const RollingStockInfo = ({
   );
 };
 
-export function comfort2pictogram(comfort: RollingStockComfortType | undefined) {
+export function comfort2pictogram(comfort: Comfort | undefined) {
   switch (comfort) {
-    case 'AC':
+    case 'AIR_CONDITIONING':
       return (
         <span className="comfort-AC">
           <IoIosSnow />

front/src/modules/rollingStock/components/RollingStockSelector/RollingStockSelector.tsx

@@ -3,7 +3,7 @@ import React, { useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import icon from 'assets/pictures/components/train.svg';
-import type { RollingStockComfortType, RollingStockWithLiveries } from 'common/api/osrdEditoastApi';
+import type { Comfort, RollingStockWithLiveries } from 'common/api/osrdEditoastApi';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
 import RollingStock2Img from 'modules/rollingStock/components/RollingStock2Img';
 import {
@@ -15,7 +15,7 @@ import RollingStockModal from 'modules/rollingStock/components/RollingStockSelec
 type RollingStockProps = {
   condensed?: boolean;
   rollingStockSelected?: RollingStockWithLiveries;
-  rollingStockComfort: RollingStockComfortType;
+  rollingStockComfort: Comfort;
   image?: JSX.Element;
 };
 

front/src/modules/rollingStock/components/RollingStockSelector/useStoreDataForRollingStockSelector.ts

@@ -4,9 +4,9 @@ import { osrdEditoastApi } from 'common/api/osrdEditoastApi';
 import { useOsrdConfSelectors } from 'common/osrdContext';
 
 export const useStoreDataForRollingStockSelector = () => {
-  const { getRollingStockID, getRollingStockComfort } = useOsrdConfSelectors();
+  const { getRollingStockID, getRollingStockComfortV2 } = useOsrdConfSelectors();
   const rollingStockId = useSelector(getRollingStockID);
-  const rollingStockComfort = useSelector(getRollingStockComfort);
+  const rollingStockComfort = useSelector(getRollingStockComfortV2);
 
   const { data: rollingStock } = osrdEditoastApi.endpoints.getRollingStockByRollingStockId.useQuery(
     {

front/src/reducers/osrdconf/osrdConfCommon/index.ts

@@ -61,7 +61,7 @@ export const defaultCommonConf: OsrdConfState = {
   featureInfoClick: { displayPopup: false },
   // Corresponds to origin and destination not defined
   pathSteps: [null, null],
-  rollingStockComfortV2: 'STANDARD',
+  rollingStockComfortV2: 'STANDARD' as const,
   startTime: new Date().toISOString(),
 };
 

front/src/reducers/osrdconf/types.ts

@@ -6,9 +6,9 @@ import type {
   RollingStockComfortType,
   PathResponse,
   AllowanceValue,
-  TrainScheduleBase,
   Distribution,
   PathfindingInputV2,
+  Comfort,
 } from 'common/api/osrdEditoastApi';
 import type { AllowanceForm } from 'modules/trainschedule/components/ManageTrainSchedule/Allowances/types';
 import type { InfraState } from 'reducers/infra';
@@ -54,7 +54,7 @@ export interface OsrdConfState extends InfraState {
   trainScheduleIDsToModify: number[];
   featureInfoClick: { displayPopup: boolean; feature?: Feature; coordinates?: number[] };
   pathSteps: (PathStep | null)[];
-  rollingStockComfortV2?: TrainScheduleBase['comfort'];
+  rollingStockComfortV2: Comfort;
   // Format ISO 8601
   startTime: string;
 }

front/tests/004-scenario-management.spec.ts

@@ -1,7 +1,7 @@
 import { test, expect } from '@playwright/test';
 import { v4 as uuidv4 } from 'uuid';
 
-import type { Infra, Project, Scenario, Study } from 'common/api/osrdEditoastApi';
+import type { Infra, Project, Scenario, Study, Timetable } from 'common/api/osrdEditoastApi';
 
 import scenarioData from './assets/operationStudies/scenario.json';
 import CommonPage from './pages/common-page-model';
@@ -13,6 +13,7 @@ let smallInfra: Infra;
 let project: Project;
 let study: Study;
 let scenario: Scenario;
+let timetable: Timetable;
 
 test.beforeAll(async () => {
   smallInfra = (await getInfra()) as Infra;
@@ -21,11 +22,15 @@ test.beforeAll(async () => {
 });
 
 test.beforeEach(async () => {
-  scenario = await postApiRequest(`/api/projects/${project.id}/studies/${study.id}/scenarios`, {
+  timetable = await postApiRequest(`/api/v2/timetable/`, {
+    electrical_profile_set_id: null,
+  });
+  scenario = await postApiRequest(`/api/v2/projects/${project.id}/studies/${study.id}/scenarios`, {
     ...scenarioData,
     name: `${scenarioData.name} ${uuidv4()}`,
     study_id: study.id,
     infra_id: smallInfra.id,
+    timetable_id: timetable.id,
   });
 });
 

front/tests/005-operational-studies.spec.ts

@@ -1,7 +1,14 @@
 import { test, expect } from '@playwright/test';
 import { v4 as uuidv4 } from 'uuid';
 
-import type { Infra, Project, RollingStock, Scenario, Study } from 'common/api/osrdEditoastApi';
+import type {
+  Infra,
+  Project,
+  RollingStock,
+  Scenario,
+  Study,
+  Timetable,
+} from 'common/api/osrdEditoastApi';
 
 import scenarioData from './assets/operationStudies/scenario.json';
 import HomePage from './pages/home-page-model';
@@ -14,6 +21,7 @@ let project: Project;
 let study: Study;
 let scenario: Scenario;
 let rollingStock: RollingStock;
+let timetable: Timetable;
 
 test.beforeAll(async () => {
   smallInfra = (await getInfra()) as Infra;
@@ -23,11 +31,15 @@ test.beforeAll(async () => {
 });
 
 test.beforeEach(async () => {
-  scenario = await postApiRequest(`/api/projects/${project.id}/studies/${study.id}/scenarios`, {
+  timetable = await postApiRequest(`/api/v2/timetable/`, {
+    electrical_profile_set_id: null,
+  });
+  scenario = await postApiRequest(`/api/v2/projects/${project.id}/studies/${study.id}/scenarios`, {
     ...scenarioData,
     name: `${scenarioData.name} ${uuidv4()}`,
     study_id: study.id,
     infra_id: smallInfra.id,
+    timetable_id: timetable.id,
   });
 });
 

front/tests/006-stdcm-page.spec.ts

@@ -12,7 +12,7 @@ const studyName = study.name;
 const scenarioName = scenario.name;
 const rollingStockName = 'rollingstock_1500_25000_test_e2e';
 
-const rollingStockTranslation = manageTrainScheduleTranslation.rollingstock;
+const emptyRouteTranslation = manageTrainScheduleTranslation.pathfindingNoState;
 
 test.describe('STDCM page', () => {
   test('should configure and launch a stdcm', async ({ page }) => {
@@ -33,17 +33,16 @@ test.describe('STDCM page', () => {
     await stdcmPage.selectMiniCard(studyName);
     await stdcmPage.selectMiniCard(scenarioName);
 
-    // Check no rollingstock is selected and "rollingstock" is in the missing information
-    await expect(stdcmPage.missingParams).toContainText(rollingStockTranslation);
+    // Check no route is selected
+    await expect(stdcmPage.pathfindingNoState).toContainText(emptyRouteTranslation);
 
     // Select a rolling stock
     await stdcmPage.openRollingstockModal();
     await expect(stdcmPage.rollingStockSelectorModal).toBeVisible();
     await stdcmPage.selectRollingStock(rollingStockName);
 
-    // Check that the rollingstock is selected and "rollingstock" is not in the missing information anymore
+    // Check that the rollingstock is selected
     await expect(stdcmPage.rollingStockSelectorModal).not.toBeVisible();
-    await expect(stdcmPage.missingParams).not.toContainText(rollingStockTranslation);
 
     await stdcmPage.selectPathByTrigram('MWS', 'NES');
     await stdcmPage.checkPathfindingDistance('34.000 km');

front/tests/007-op-rollingstock-tab.spec.ts

@@ -11,7 +11,6 @@ import type {
 } from 'common/api/osrdEditoastApi';
 
 import scenarioData from './assets/operationStudies/scenario.json';
-import HomePage from './pages/home-page-model';
 import OperationalStudiesPage from './pages/operational-studies-page-model';
 import RollingStockSelectorPage from './pages/rollingstock-selector-page';
 import ScenarioPage from './pages/scenario-page-model';
@@ -52,10 +51,6 @@ test.describe('Verifying that all elements in the rolling stock tab are loaded c
     const scenarioPage = new ScenarioPage(page);
     const rollingStockSelector = new RollingStockSelectorPage(page);
 
-    // TODO: DROP TSV1: remove this part
-    const homePage = new HomePage(page);
-    await homePage.goToHomePage();
-
     // Navigate to the created scenario page
     await page.goto(
       `/operational-studies/projects/${project.id}/studies/${study.id}/scenarios/${scenario.id}`

front/tests/008-allowances.spec.ts

@@ -1,6 +1,7 @@
 import fs from 'fs';
 
 import { test as setup } from '@playwright/test';
+import { v4 as uuidv4 } from 'uuid';
 
 import type {
   Infra,
@@ -60,9 +61,16 @@ async function createDataForTests() {
     budget: 1234567890,
   } as StudyCreateForm);
 
-  await postApiRequest(`/api/projects/${project.id}/studies/${study.id}/scenarios`, {
+  const timetable = await postApiRequest(`/api/v2/timetable/`, {
+    electrical_profile_set_id: null,
+  });
+
+  await postApiRequest(`/api/v2/projects/${project.id}/studies/${study.id}/scenarios`, {
     ...scenarioData,
+    name: `${scenarioData.name} ${uuidv4()}`,
+    study_id: study.id,
     infra_id: smallInfra.id,
+    timetable_id: timetable.id,
   });
 }
 

front/tests/global-setup.ts

@@ -3,7 +3,7 @@ import { expect, type Locator, type Page } from '@playwright/test';
 import SimulationConfPage from './simulation-conf-page';
 
 class StdcmPage extends SimulationConfPage {
-  readonly missingParams: Locator;
+  readonly pathfindingNoState: Locator;
 
   // Scenario Explorator
   private scenarioExplorerButton: Locator;
@@ -18,7 +18,7 @@ class StdcmPage extends SimulationConfPage {
   constructor(page: Page) {
     super(page);
 
-    this.missingParams = page.locator('.missing-params');
+    this.pathfindingNoState = page.getByTestId('pathfinding-no-state');
 
     // Scenario Explorator
     this.scenarioExplorerButton = page.getByTestId('scenario-explorator');

front/tests/pages/stdcm-page-model.ts

@@ -7,6 +7,7 @@ import HomePage from '../pages/home-page-model';
 import RollingStockSelectorPage from '../pages/rollingstock-selector-page';
 import ScenarioPage from '../pages/scenario-page-model';
 
+// TODO : Check if this util can be reutilized in other tests
 // Scenario creation
 export default async function createCompleteScenario(
   page: Page,
@@ -20,7 +21,7 @@ export default async function createCompleteScenario(
   const rollingStock = await getRollingStock();
 
   const scenario = await postApiRequest(
-    `/api/projects/${project.id}/studies/${study.id}/scenarios`,
+    `/api/v2/projects/${project.id}/studies/${study.id}/scenarios`,
     {
       ...scenarioData,
       name: `${scenarioData.name} ${uuidv4()}`,