From c87f7d1f7d87ebba65dafea87bd1d02fb9cbe563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 8 Jun 2022 14:17:34 +0200
Subject: [PATCH 1/3] test(e2e): check that running a calculation in solver
does not modify selected searched parameter
refs #486
---
e2e/solveur.e2e-spec.ts | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/e2e/solveur.e2e-spec.ts b/e2e/solveur.e2e-spec.ts
index 3de2651cf..a742f9078 100644
--- a/e2e/solveur.e2e-spec.ts
+++ b/e2e/solveur.e2e-spec.ts
@@ -2,7 +2,7 @@ import { AppPage } from "./app.po";
import { ListPage } from "./list.po";
import { CalculatorPage } from "./calculator.po";
import { Navbar } from "./navbar.po";
-import { browser } from "protractor";
+import { browser, by, element } from "protractor";
import { SideNav } from "./sidenav.po";
import { PreferencesPage } from "./preferences.po";
@@ -145,4 +145,29 @@ describe("Solveur - ", () => {
const hasResultsClone2 = await calcPage.hasResults();
expect(hasResultsClone2).toBe(true);
});
+
+ it("channel flow example > solver > change searched parameter > run calculation", async () => {
+ // open "channel flow with hydraulic structures" example
+ const examples = await element.all(by.css("#examples-list .load-example"));
+ await examples[1].click();
+ await browser.sleep(500);
+
+ // select solver tab
+ await navbar.clickCalculatorTab(3);
+ await browser.sleep(200);
+
+ // modify searched parameter
+ const sel = calcPage.getSelectById("select_searched_param");
+ await calcPage.changeSelectValue(sel, 11);
+ await browser.sleep(100);
+ const selText = await calcPage.getSelectValueText(sel);
+
+ // run calculation
+ const calcButton = calcPage.getCalculateButton();
+ await calcButton.click();
+ await browser.sleep(500);
+
+ // check "search parameter" value has not changed
+ expect(await calcPage.getSelectValueText(sel)).toEqual(selText);
+ });
});
--
GitLab
From 492c60432c525c59579e16e16b1da3be44055f5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Thu, 9 Jun 2022 10:11:30 +0200
Subject: [PATCH 2/3] update jalhyd_branch
refs #486
---
jalhyd_branch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jalhyd_branch b/jalhyd_branch
index 227bffb5c..d64531f13 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-311-parametres-lies-ameliorer-les-informations-sur-la-cible
+devel
--
GitLab
From ca9b3137da78dd3fca821c330ed61874d3b106aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Thu, 9 Jun 2022 10:15:36 +0200
Subject: [PATCH 3/3] fix: SelectFieldCustom.populate(): use parameter parent
compute node instead of origin nub
refs #486
---
src/app/formulaire/elements/select-field-custom.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/formulaire/elements/select-field-custom.ts b/src/app/formulaire/elements/select-field-custom.ts
index 1036e25ac..1b7ddc710 100644
--- a/src/app/formulaire/elements/select-field-custom.ts
+++ b/src/app/formulaire/elements/select-field-custom.ts
@@ -112,7 +112,7 @@ export class SelectFieldCustom extends SelectField {
const calc = fs.getFormulaireFromId(p.originNub.uid).calculatorName;
const varName = fs.expandVariableName(p.originNub.calcType, p.symbol);
const label = `${p.symbol} - ${varName} (${calc})`;
- this.addEntry(new SelectEntry(this._entriesBaseId + p.originNub.uid + "_" + p.symbol, p, decodeHtml(label)));
+ this.addEntry(new SelectEntry(this._entriesBaseId + p.getParentComputeNode(false).uid + "_" + p.symbol, p, decodeHtml(label)));
}
}
break;
--
GitLab