MàJ tests e2e

e2e/load-linked-params.e2e-spec.ts

@@ -47,7 +47,7 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
     // check target params values
     const sp_lb = calcPage.getSelectById("linked_LargeurBerge");
     const sp_lbv = await calcPage.getSelectValueText(sp_lb);
-    expect(sp_lbv).toEqual("L (Ouvrages, ouvrage 3)");
+    expect(sp_lbv).toContain("Largeur du déversoir (Ouvrages, ouvrage 3)");
 
     // 2. check Passe à macro-rugosités
     await navbar.clickCalculatorTab(1);
@@ -56,11 +56,11 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
     // check target params values
     const mr_zf1 = calcPage.getSelectById("linked_ZF1");
     const mr_zf1v = await calcPage.getSelectValueText(mr_zf1);
-    expect(mr_zf1v).toEqual("Z1 (Ouvrages)");
+    expect(mr_zf1v).toContain("Cote de l'eau amont (Ouvrages)");
 
     const mr_q = calcPage.getSelectById("linked_Q");
     const mr_qv = await calcPage.getSelectValueText(mr_q);
-    expect(mr_qv).toEqual("Q (Sec. param., section)");
+    expect(mr_qv).toContain("Débit (Sec. param., section)");
 
     // 3. check Lois d'ouvrages
     await navbar.clickCalculatorTab(2);
@@ -69,19 +69,19 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
     // check target params values
     const lo_z2 = calcPage.getSelectById("linked_Z2");
     const lo_z2v = await calcPage.getSelectValueText(lo_z2);
-    expect(lo_z2v).toEqual("ZF1 (Macro-rugo.)");
+    expect(lo_z2v).toContain("Cote de fond aval (Macro-rugo.)");
 
     const lo_l = calcPage.getSelectById("1_linked_L");
     const lo_lv = await calcPage.getSelectValueText(lo_l);
-    expect(lo_lv).toEqual("L (résultat de Ouvrages)");
+    expect(lo_lv).toContain("Largeur du déversoir (Ouvrages)");
 
     const lo_w = calcPage.getSelectById("2_linked_W");
     const lo_wv = await calcPage.getSelectValueText(lo_w);
-    expect(lo_wv).toEqual("W (Ouvrages, ouvrage 2)");
+    expect(lo_wv).toContain("Ouverture de vanne (Ouvrages, ouvrage 2)");
 
     const lo_cd = calcPage.getSelectById("2_linked_Cd");
     const lo_cdv = await calcPage.getSelectValueText(lo_cd);
-    expect(lo_cdv).toEqual("Cd (Ouvrages, ouvrage 1)");
+    expect(lo_cdv).toContain("Coefficient de débit (Ouvrages, ouvrage 1)");
 
     // 4. check Régime uniforme
     await navbar.clickCalculatorTab(3);
@@ -90,7 +90,7 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
     // check target params values
     const lo_q = calcPage.getSelectById("linked_Q");
     const lo_qv = await calcPage.getSelectValueText(lo_q);
-    expect(lo_qv).toEqual("CvQT (Déver. dénoyés, résultat complémentaire)");
+    expect(lo_qv).toContain("Débit corrigé (Déver. dénoyés)");
 
     // 5. check Déver. dénoyés
     await navbar.clickCalculatorTab(4);
@@ -99,7 +99,7 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
     // check target params values
     const lo_br = calcPage.getSelectById("linked_BR");
     const lo_brv = await calcPage.getSelectValueText(lo_br);
-    expect(lo_brv).toEqual("LargeurBerge (Sec. param., section)");
+    expect(lo_brv).toContain("Largeur au miroir (Sec. param.)");
   });
 
 });

e2e/pab.e2e-spec.ts

@@ -99,8 +99,12 @@ describe("ngHyd − Passe à Bassins", () => {
       const debit = calcPage.getInputById("generatePabDebit");
       expect(await debit.getAttribute("value")).toBe("1.5");
       await debit.clear();
-      await debit.sendKeys("1.");
-      await debit.sendKeys("6"); // send "1.6" in 2 movements, because "." triggers an error that interrupts sendKeys() !
+      // send "1.6" in 3 movements, because "." triggers an error and Angular can't cope with the subsequent keys
+      await debit.sendKeys("1");
+      await browser.sleep(300);
+      await debit.sendKeys(".");
+      await browser.sleep(300);
+      await debit.sendKeys("6");
       await browser.sleep(300);
       const coteAmont = calcPage.getInputById("generatePabCoteAmont");
       expect(await coteAmont.getAttribute("value")).toBe("114");
@@ -156,14 +160,14 @@ describe("ngHyd − Passe à Bassins", () => {
       // check <select> and QA values
       const expectedCloisons = [ "Cloisons 1", "Cloisons 2", "Cloisons", "Cloisons 2", "Cloisons 1" ];
       const expectedQA = [ 2, 1, 3, 5, 4 ];
-      let i = 0;
-      innerFieldsets.each(async (inf) => {
+      for (let i = 0; i < innerFieldsets.length; i++) {
+        const inf = innerFieldsets[i];
         const smc = inf.element(by.css("mat-select#select_modele_cloisons"));
         expect(await calcPage.getSelectValueText(smc)).toEqual(expectedCloisons[i]);
-        const QA = inf.element(by.css("input#QA"));
+        const QA = inf.element(by.css("input[id$=QA]"));
         expect(Number(await QA.getAttribute("value"))).toBe(expectedQA[i]);
         i++;
-      });
+      }
       // check downstream wall
       const smca = calcPage.getSelectById("select_modele_cloison_aval");
       expect(await calcPage.getSelectValueText(smca)).toEqual("Ouvrages 1");
@@ -194,13 +198,14 @@ describe("ngHyd − Passe à Bassins", () => {
       const expectedCloisons = [ "Cloisons 1", "Cloisons 2", "Cloisons", "Cloisons 2", "Cloisons 1" ];
       const expectedQA = [ 2, 1, 3, 5, 4 ];
       let i = 0;
-      innerFieldsets.each(async (inf) => {
+      for (let i = 0; i < innerFieldsets.length; i++) {
+        const inf = innerFieldsets[i];
         const smc = inf.element(by.css("mat-select#select_modele_cloisons"));
         expect(await calcPage.getSelectValueText(smc)).toEqual(expectedCloisons[i]);
-        const QA = inf.element(by.css("input#QA"));
+        const QA = inf.element(by.css("input[id$=QA]"));
         expect(Number(await QA.getAttribute("value"))).toBe(expectedQA[i]);
         i++;
-      });
+      }
       // check downstream wall
       const smca = calcPage.getSelectById("select_modele_cloison_aval");
       expect(await calcPage.getSelectValueText(smca)).toEqual("Ouvrages 1");