fixup! front: fix allowances do not reset when changing the path

Author: clarani

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

@@ -30,18 +30,13 @@ const RollingStockCardButtons = ({
   const rollingStockComfort = useSelector(getRollingStockComfort);
   const [comfort, setComfort] = useState('STANDARD');
 
-  const {
-    updatePathfindingID,
-    updatePowerRestrictionRanges,
-    updateRollingStockComfort,
-    updateRollingStockID,
-  } = useOsrdConfActions();
+  const { updatePathfindingID, updateRollingStockComfort, updateRollingStockID } =
+    useOsrdConfActions();
 
   const selectRollingStock = () => {
     setOpenedRollingStockCardId(undefined);
     dispatch(updateRollingStockComfort(comfort as RollingStockComfortType));
     dispatch(updateRollingStockID(id));
-    dispatch(updatePowerRestrictionRanges([]));
     dispatch(updatePathfindingID(undefined));
     closeModal();
   };

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

@@ -74,6 +74,15 @@ test.describe('Testing if all mandatory elements simulation configuration are lo
       await playwrightRollingstockModalPage.getRollingStockInfoComfort().textContent()
     ).toMatch(/ConfortSStandard/i);
 
+    // ***************** Test choice Origin/Destination *****************
+    await scenarioPage.openTabByDataId('tab-pathfinding');
+    const itinerary = scenarioPage.getItineraryModule;
+    await expect(itinerary).toBeVisible();
+
+    await scenarioPage.getPathfindingByTriGramSearch('MWS', 'NES');
+
+    await scenarioPage.checkPathfindingDistance('33.950 km');
+
     // TODO: move this test in his own file
     // ***************** Test Composition Code *****************
     await scenarioPage.openTabByDataId('tab-simulation-settings');
@@ -87,19 +96,10 @@ test.describe('Testing if all mandatory elements simulation configuration are lo
       /Voyageurs - Automoteurs - E32C/i
     );
 
-    // ***************** Test choice Origin/Destination *****************
-    await scenarioPage.openTabByDataId('tab-pathfinding');
-    const itinerary = scenarioPage.getItineraryModule;
-    await expect(itinerary).toBeVisible();
-
-    await scenarioPage.getPathfindingByTriGramSearch('MWS', 'NES');
-
-    await scenarioPage.checkPathfindingDistance('33.950 km');
-
     // ***************** Test Add Train Schedule *****************
     await scenarioPage.addTrainSchedule();
     await scenarioPage.page.waitForSelector('.dots-loader', { state: 'hidden' });
-    await scenarioPage.checkToastSNCFTitle();
+    await scenarioPage.checkTrainHasBeenAdded();
     await scenarioPage.returnSimulationResult();
     await scenarioPage.checkNumberOfTrains(Number(trainCount));
   });

front/tests/assets/utils.ts

@@ -136,7 +136,7 @@ export default async function createCompleteScenario(
   // ***************** Create train *****************
   await scenarioPage.addTrainSchedule();
   await scenarioPage.page.waitForSelector('.dots-loader', { state: 'hidden' });
-  await scenarioPage.checkToastSNCFTitle();
+  await scenarioPage.checkTrainHasBeenAdded();
   await scenarioPage.returnSimulationResult();
 }
 

front/tests/pages/base-page.ts

@@ -1,4 +1,4 @@
-import type { Locator, Page } from '@playwright/test';
+import { expect, type Locator, type Page } from '@playwright/test';
 
 export default class BasePage {
   public page: Page;
@@ -7,11 +7,14 @@ export default class BasePage {
 
   protected viteOverlay: Locator;
 
+  readonly lastToast: Locator;
+
   constructor(page: Page) {
     this.page = page;
 
     this.backToHomePageButton = page.locator('.mastheader-logo');
     this.viteOverlay = page.locator('vite-plugin-checker-error-overlay');
+    this.lastToast = page.getByTestId('toast-SNCF').last();
   }
 
   // Completly remove VITE button & sign
@@ -24,4 +27,12 @@ export default class BasePage {
   async backToHomePage() {
     await this.backToHomePageButton.click();
   }
+
+  async checkLastToastBody(text: string | RegExp) {
+    await expect(this.lastToast.locator('.toast-body')).toHaveText(text);
+  }
+
+  async checkLastToastTitle(text: string | RegExp) {
+    await expect(this.lastToast.getByTestId('toast-SNCF-title')).toHaveText(text);
+  }
 }

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

@@ -1,6 +1,11 @@
 import { type Locator, type Page, expect } from '@playwright/test';
 
-class PlaywrightScenarioPage {
+import BasePage from './base-page';
+import manageTrainScheduleTranslation from '../../public/locales/fr/operationalStudies/manageTrainSchedule.json';
+
+const trainAddedTranslation = manageTrainScheduleTranslation.trainAdded;
+
+class PlaywrightScenarioPage extends BasePage {
   readonly getScenarioUpdateBtn: Locator;
 
   readonly getScenarioDeleteConfirmBtn: Locator;
@@ -57,10 +62,6 @@ class PlaywrightScenarioPage {
 
   readonly getReturnSimulationResultBtn: Locator;
 
-  readonly getToastSNCF: Locator;
-
-  readonly getToastSNCFTitle: Locator;
-
   readonly getPathfindingState: Locator;
 
   readonly getSearchByTrigramButton: Locator;
@@ -92,6 +93,8 @@ class PlaywrightScenarioPage {
   readonly getSuccessBtn: Locator;
 
   constructor(readonly page: Page) {
+    super(page);
+
     this.getRollingStockSelector = page.getByTestId('rollingstock-selector-empty');
     this.getScenarioUpdateBtn = page.getByTitle('Modifier le scénario');
     this.getScenarioDeleteConfirmBtn = page
@@ -134,8 +137,6 @@ class PlaywrightScenarioPage {
       .locator('.scenario-timetable-trains')
       .locator('.scenario-timetable-train');
     this.getReturnSimulationResultBtn = page.getByTestId('return-simulation-result');
-    this.getToastSNCF = page.getByTestId('toast-SNCF');
-    this.getToastSNCFTitle = this.getToastSNCF.getByTestId('toast-SNCF-title');
     this.getPathfindingState = page.locator('.pathfinding-state-main-container');
     this.getTimetableList = page.locator('.scenario-timetable-train-with-right-bar');
     this.getTrainEditBtn = page.locator('.scenario-timetable-train-buttons-update');
@@ -241,12 +242,8 @@ class PlaywrightScenarioPage {
     await this.getReturnSimulationResultBtn.click();
   }
 
-  async checkToastSNCFTitle() {
-    await expect(this.getToastSNCFTitle).not.toBeEmpty();
-  }
-
-  async checkToastSNCFBody(text: string | RegExp) {
-    await expect(this.getToastSNCF.locator('.toast-body')).toHaveText(text);
+  async checkTrainHasBeenAdded() {
+    this.checkLastToastTitle(trainAddedTranslation);
   }
 
   getBtnByName(name: string | RegExp) {