- edited stdcm tests after modification

Signed-off-by: Mathieu <[email protected]>
OpenRailAssociation · Dec 10, 2024 · 7bb63f6 · 7bb63f6
1 parent bb737dc
commit 7bb63f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/front/src/applications/stdcm/types.ts b/front/src/applications/stdcm/types.ts
@@ -154,6 +154,7 @@ export type StdcmConfigCardProps = {
 export enum ArrivalTimeTypes {
   PRECISE_TIME = 'preciseTime',
   ASAP = 'asSoonAsPossible',
+  RESPECT_DESTINATION_SCHEDULE = 'respectDestinationSchedule',
 }
 
 export enum StdcmConfigErrorTypes {

diff --git a/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts b/front/src/applications/stdcm/utils/checkStdcmConfigErrors.ts
@@ -25,11 +25,14 @@ const checkStdcmConfigErrors = (
     return { errorType: StdcmConfigErrorTypes.PATHFINDING_FAILED };
   }
 
-  const areBothPointsASAP =
-    origin.arrivalType === ArrivalTimeTypes.ASAP &&
-    destination.arrivalType === ArrivalTimeTypes.ASAP;
+  const isOriginRespectDestinationSchedule =
+    origin.arrivalType === ArrivalTimeTypes.RESPECT_DESTINATION_SCHEDULE;
 
-  if (areBothPointsASAP) {
+  const isDestinationASAP = destination.arrivalType === ArrivalTimeTypes.ASAP;
+
+  const areBothPointsNotSchedule = isOriginRespectDestinationSchedule && isDestinationASAP;
+
+  if (areBothPointsNotSchedule) {
     return { errorType: StdcmConfigErrorTypes.NO_SCHEDULED_POINT };
   }
 

diff --git a/front/tests/pages/stdcm-page-model.ts b/front/tests/pages/stdcm-page-model.ts
@@ -318,7 +318,7 @@ class STDCMPage {
     await expect(this.timeOriginArrival).toHaveValue('');
     await expect(this.toleranceOriginArrival).toHaveValue('-30/+30');
     await this.dynamicOriginCh.selectOption('BC');
-    await this.originArrival.selectOption('asSoonAsPossible');
+    await this.originArrival.selectOption('respectDestinationSchedule');
     await expect(this.dateOriginArrival).not.toBeVisible();
     await expect(this.timeOriginArrival).not.toBeVisible();
     await expect(this.toleranceOriginArrival).not.toBeVisible();