From 07f08f6ccbdb0e1c0c98551bcb53a2e10cdd932d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Thu, 2 Jun 2022 14:47:07 +0200
Subject: [PATCH 1/2] update jalhyd_branch
refs #547
---
jalhyd_branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jalhyd_branch b/jalhyd_branch
index d64531f13..f4a6ca09b 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-devel
+289-liens-inaccessibles-pour-certains-modules
--
GitLab
From a10638d61356232a2d56b71f6a75dc77dfe7095b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 29 Jun 2022 14:27:43 +0200
Subject: [PATCH 2/2] fix: make e2e tests pass after modification setting
parameters from linked to fixed mode in case of session loading error
see jalhyd#289/adf6009, nghyd#551
refs #547
---
e2e/compute-reset-chained-links.e2e-spec.ts | 3 --
e2e/load-linked-params.e2e-spec.ts | 34 ++++++++++++++-------
e2e/session/session-cascade-results.json | 2 +-
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/e2e/compute-reset-chained-links.e2e-spec.ts b/e2e/compute-reset-chained-links.e2e-spec.ts
index 65e2e4e95..cd97f196a 100644
--- a/e2e/compute-reset-chained-links.e2e-spec.ts
+++ b/e2e/compute-reset-chained-links.e2e-spec.ts
@@ -98,9 +98,6 @@ describe("ngHyd − compute then reset chained results − ", () => {
await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(3);
- // dirty hack : get unwanted module first to prevent Calc button
- // of PAB Dimensions to be greyed-out @WTF
- await navbar.clickCalculatorTabForUid("Y2s1cG");
// 1. get down-most module (PAB Dimensions)
await navbar.clickCalculatorTabForUid("eHh5YX");
diff --git a/e2e/load-linked-params.e2e-spec.ts b/e2e/load-linked-params.e2e-spec.ts
index 00b262f24..dd8253971 100644
--- a/e2e/load-linked-params.e2e-spec.ts
+++ b/e2e/load-linked-params.e2e-spec.ts
@@ -80,13 +80,24 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
await browser.sleep(500);
// check target params values
- const lo_z2 = calcPage.getSelectById("linked_Z2");
- const lo_z2v = await calcPage.getSelectValueText(lo_z2);
- 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).toContain("Largeur au miroir (Sec. param.)");
+ // const lo_z2 = calcPage.getSelectById("linked_Z2");
+ // const lo_z2v = await calcPage.getSelectValueText(lo_z2);
+ // expect(lo_z2v).toContain("Cote de fond aval (Macro-rugo.)");
+
+ /**
+ * depuis qu'on interdit les liens vers des paramètres cachés/liés eux mêmes,
+ * l'appli les remplace par un paramètre en mode fixé (valeur undefined) lors du chargement d'une session
+ * jalhyd#289/adf6009
+ * nghyd#551
+ */
+ const inpZ2 = calcPage.getInputById("Z2");
+ expect(await inpZ2.getAttribute("value")).toEqual("");
+
+ // const lo_l = calcPage.getSelectById("1_linked_L");
+ // const lo_lv = await calcPage.getSelectValueText(lo_l);
+ // expect(lo_lv).toContain("Largeur au miroir (Sec. param.)");
+ const inpL = calcPage.getInputById("1_L");
+ expect(await inpL.getAttribute("value")).toEqual("");
const lo_w = calcPage.getSelectById("2_linked_W");
const lo_wv = await calcPage.getSelectValueText(lo_w);
@@ -97,9 +108,10 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
await browser.sleep(500);
// check target params values
- const lo_br = calcPage.getSelectById("linked_BR");
- const lo_brv = await calcPage.getSelectValueText(lo_br);
- expect(lo_brv).toContain("Largeur au miroir (Sec. param.)");
+ // const lo_br = calcPage.getSelectById("linked_BR");
+ // const lo_brv = await calcPage.getSelectValueText(lo_br);
+ // expect(lo_brv).toContain("Largeur au miroir (Sec. param.)");
+ const inpBR = calcPage.getInputById("BR");
+ expect(await inpBR.getAttribute("value")).toEqual("");
});
-
});
diff --git a/e2e/session/session-cascade-results.json b/e2e/session/session-cascade-results.json
index eebf487fc..8602fd4f3 100644
--- a/e2e/session/session-cascade-results.json
+++ b/e2e/session/session-cascade-results.json
@@ -120,7 +120,7 @@
"symbol": "Q",
"mode": "LINK",
"targetNub": "MGg5OH",
- "targetParam": "Q_GuideTech"
+ "targetParam": "Q"
},
{
"symbol": "D",
--
GitLab