diff --git a/e2e/solveur.e2e-spec.ts b/e2e/solveur.e2e-spec.ts index 3de2651cfdbec0cbffe6d8e5dd2611af28dfa8cb..a742f9078f79467b1f6cff5fd3d92d276d0d8cdf 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); + }); }); diff --git a/jalhyd_branch b/jalhyd_branch index 227bffb5c45a476c187cd747d30ed0cd2a36d307..d64531f1305e091791eac674c3a36d86b9e17ddd 100644 --- a/jalhyd_branch +++ b/jalhyd_branch @@ -1 +1 @@ -311-parametres-lies-ameliorer-les-informations-sur-la-cible +devel diff --git a/src/app/formulaire/elements/select-field-custom.ts b/src/app/formulaire/elements/select-field-custom.ts index 1036e25ac1fd24cdef5a7bde122ec68fccb321e3..1b7ddc7105ebcdc51e7f45e274a2cb55367a05a0 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;