diff --git a/e2e/calc-all-examples.e2e-spec.ts b/e2e/calc-all-examples.e2e-spec.ts
index adb93e8f118778856e79f5b024946dfc4d436ec5..04a64a3e362c74b3eec8daec21405ec8d030bcea 100644
--- a/e2e/calc-all-examples.e2e-spec.ts
+++ b/e2e/calc-all-examples.e2e-spec.ts
@@ -42,10 +42,6 @@ describe("ngHyd − example sessions −", () => {
}
else {
// empty session
- // await navbar.clickMenuButton();
- // await browser.pause(200);
- // await sideNav.clickNewSessionButton();
- // await browser.pause(1000);
await newSession(navBar, sideNav);
}
@@ -62,8 +58,6 @@ describe("ngHyd − example sessions −", () => {
// select module
await navBar.openNthCalculator(j);
await browser.pause(300);
- // await calcPage.closeSnackBar(); // opening a calculator can trigger a snackbar with "results invalidated for..."
- // await browser.pause(300);
await calcPage.closeSnackBars(5, 500); // opening a calculator can trigger a snackbar with "results invalidated for..."
await browser.pause(500);
// calculate module
diff --git a/e2e/calculate-all-params.e2e-spec.ts b/e2e/calculate-all-params.e2e-spec.ts
index 0af1460ba8d35e8410f06cc5ac646bdb8fc63baf..744c838778f84a8f64cfb2a489f66872345463e2 100644
--- a/e2e/calculate-all-params.e2e-spec.ts
+++ b/e2e/calculate-all-params.e2e-spec.ts
@@ -37,24 +37,6 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
// get calculators list (IDs) @TODO read it from config, but can't import jalhyd here :/
const calcTypes = testedCalcTypes;
- // const calcTypes = [0];
- // export const testedCalcTypes = [
- // 0,
- // // omit 1 - LechaptCalmon
- // 2, 3, 4, 5, 6,
- // // omit 7 - Structure
- // 8, 9, 10, 11, 12, 13,
- // // omit 14 -Section
- // 15,
- // // omit 16 - CloisonAval
- // 17, 18, 19, 20, 21, 22, 23, 24, 25,
- // // omit 26 - YAXN
- // 27, 28, 29, 30,
- // // omit 31 - PbCloison and 32 - PbBassin
- // 33, 34, 35
- // ];
- // const calcTypes =[30];
-
// for each calculator
for (const ct of calcTypes) {
@@ -70,21 +52,11 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
describe(" − calculate all parameters of calculator type [" + ct + "]", () => {
it("", async () => {
await newSession(navBar, sideNav);
-
- //await browser.execute("window.moveTo(2000,30)")
- // await browser.driver.moveTo(2000,30);
-
- // go to list page
- // await navBar.clickNewCalculatorButton();
-
- // click calculator button (instanciate)
- // await listPage.clickMenuEntryForCalcType(ct);
await openCalculator(ct, navBar, listPage);
// get all parameters IDs
const inputs = await calcPage.getParamInputsHavingCalcMode();
- // if ((await inputs).length > 0) {
if (inputs.length > 0) {
// for each param
for (let i = 0; i < inputs.length; i++) {
@@ -99,9 +71,7 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
// grab input again because calculating the module just refreshed all the fieldsets
const input = (await calcPage.getParamInputsHavingCalcMode())[i];
// click "calc" mode button for this parameter
- // await browser.pause(50);
await calcPage.setParamMode(input, "cal");
- // await browser.pause(50);
// check that only 1 button is in "calc" state
const nbParamsCalc = await calcPage.getCheckedCalcModeButtons().length;
expect(nbParamsCalc).toBe(1);
@@ -127,6 +97,5 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
}
});
});
- // break;
}
});
diff --git a/e2e/calculate-button-validation.e2e-spec.ts b/e2e/calculate-button-validation.e2e-spec.ts
index d11a3f9ece28ce2bf80e388de6919da50cd54bf1..a0634d81a7bd07968b329bf3939788f9c20db0c0 100644
--- a/e2e/calculate-button-validation.e2e-spec.ts
+++ b/e2e/calculate-button-validation.e2e-spec.ts
@@ -147,17 +147,13 @@ describe("Calculate button - ", () => {
// for each input, set empty and check calculate button is not active
- // const pfls = await calcPage.getParamfieldlines();
const inputs = await calcPage.getParamInputs();
- // for (const pfl of pfls) {
for (const inp of inputs) {
// set input to fixed mode
- // await calcPage.setParamMode(pfl, "fix");
await calcPage.setParamMode(inp, "fix");
await browser.pause(100);
// clear input
- // const inp = await calcPage.getParamfieldlineInput(pfl);
await calcPage.clearInput(inp);
await browser.pause(10);
diff --git a/e2e/calculate-linked-params.e2e-spec.ts b/e2e/calculate-linked-params.e2e-spec.ts
index ca07539408c9d2dc99073aff67a75571a51cb53c..557484db9e75e6e039e9fb5ba0e0cbe611a36a38 100644
--- a/e2e/calculate-linked-params.e2e-spec.ts
+++ b/e2e/calculate-linked-params.e2e-spec.ts
@@ -46,19 +46,6 @@ describe("ngHyd − calculate with linked parameters", () => {
await browser.pause(100);
});
- afterEach(async () => {
- //await browser.reloadSession();
- // await browser.pause(500);
- });
-
- // describe('webdriver.io page', () => {
- // it('should reload my session with current capabilities', () => {
- // console.log(browser.sessionId)
- // browser.reloadSession()
- // console.log(browser.sessionId)
- // })
- // });
-
async function computeAndCheckPresenceOfResults() {
// check that "compute" button is active
const calcButton = await calcPage.checkCalcButtonEnabled(true);
@@ -71,9 +58,6 @@ describe("ngHyd − calculate with linked parameters", () => {
}
it(" − direct links : parameter linked to a single parameter", async () => {
- // await browser.reloadSession();
- // await browser.pause(1000);
-
// create a Régime uniforme
await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(3);
@@ -88,8 +72,6 @@ describe("ngHyd − calculate with linked parameters", () => {
await changeSelectValue(sel, 0);
await computeAndCheckPresenceOfResults();
- // await browser.reloadSession();
- // await browser.closeWindow();
});
it(" − direct links : parameter linked to a single parameter, plus local variated parameter", async () => {
@@ -110,7 +92,6 @@ describe("ngHyd − calculate with linked parameters", () => {
await calcPage.setParamMode(W, "var");
await computeAndCheckPresenceOfResults();
- // await browser.reloadSession();
});
it(" − direct links : parameter linked to a variated parameter", async () => {
@@ -277,7 +258,6 @@ describe("ngHyd − calculate with linked parameters", () => {
// check that number of rows in the variated results table equals number of variated values
const varRows = await calcPage.getAllVariatedResultsRows();
- // const nbRows = await varRows.length;
expect(varRows.length).toBe(191); // boundaries are included
// check that all parameters have values for all iterations (Z2 might miss some if repeat strategy is not applied)
@@ -313,7 +293,6 @@ describe("ngHyd − calculate with linked parameters", () => {
let frt = await calcPage.getFixedResultsTable();
let volumeRow = await calcPage.getNthRow(frt, 3);
let volumeCol = await calcPage.getNthColumn(volumeRow, 2);
- // let volume = await volumeCol.getAttribute("textContent");
let volume = await volumeCol.getText();
expect(Number(volume)).toBeCloseTo(44.565, 3);
@@ -329,7 +308,6 @@ describe("ngHyd − calculate with linked parameters", () => {
frt = await calcPage.getFixedResultsTable();
volumeRow = await calcPage.getNthRow(frt, 3);
volumeCol = await calcPage.getNthColumn(volumeRow, 2);
- // volume = await volumeCol.getText("textContent");
volume = await volumeCol.getText();
expect(Number(volume)).toBeCloseTo(44.565, 3);
});
diff --git a/e2e/calculator.e2e-spec.ts b/e2e/calculator.e2e-spec.ts
index 5c41eba08c773569f5b2cd02d41dbdd1c4e8ab38..47f0cf969a013f9c6e79ced0474bd9bb5dc329d5 100644
--- a/e2e/calculator.e2e-spec.ts
+++ b/e2e/calculator.e2e-spec.ts
@@ -22,7 +22,6 @@ describe("ngHyd − calculator page", () => {
it("when a calculator is open, no active label should be empty", async () => {
const labels = await page.getInputLabels();
- // await labels.each(async (l) => {
for (const l of labels) {
const label = await l.getText();
expect(label.length).toBeGreaterThan(0);
diff --git a/e2e/calculator.po.ts b/e2e/calculator.po.ts
index 531b0e19555122359f2def9431e00a5565fb5e32..8452515558da1fc812b7e957719e9b8be30df30f 100644
--- a/e2e/calculator.po.ts
+++ b/e2e/calculator.po.ts
@@ -12,58 +12,15 @@ export class CalculatorPage {
return $$("ngparam-input input.form-control");
}
- // getParamfieldlines() {
- // return $$("param-field-line");
- // }
-
- // getParamfieldlineInput(pfl) {
- // return pfl.$("ngparam-input input.form-control");
- // }
-
- // async getParamInputsHavingCalcMode() {
- // const ret = [];
- // const inputs = await this.getParamInputs();
- // // await inputs.each(async (i) => {
- // // if (await this.inputHasCalcModeButton(i)) {
- // // ret.push(i);
- // // }
- // // });
-
- // // for await (const img of $$('img')) {
- // // console.log(await img.getAttribute('src))
- // // }
-
- // for await (const i of inputs) {
- // if (await this.inputHasCalcModeButton(i)) {
- // ret.push(i);
- // }
- // }
-
- // return ret;
- // }
async getParamInputsHavingCalcMode() {
const ret = [];
const inputs = await $$("param-field-line");
- // await inputs.each(async (i) => {
- // if (await this.inputHasCalcModeButton(i)) {
- // ret.push(i);
- // }
- // });
-
- // for await (const img of $$('img')) {
- // console.log(await img.getAttribute('src))
- // }
-
for (const inp of inputs) {
- // if (await this.inputHasCalcModeButton(i)) {
- // ret.push(i);
- // }
const toggle = await inp.$("mat-button-toggle.radio_cal > button");
if (await toggle.isExisting()) {
ret.push(inp);
}
}
-
return ret;
}
@@ -88,8 +45,6 @@ export class CalculatorPage {
if ((await sel.isExisting()) && (await sel.isDisplayed())) {
await sel.click();
const options = $$(".cdk-overlay-container mat-option");
- // FIXME>>>>await sel.sendKeys(protractor.Key.ESCAPE); // close dropdown
- //await sel.keys('Escape'); // close dropdown
await browser.keys(Key.Escape); // close dropdown
return await options.length;
}
@@ -113,8 +68,6 @@ export class CalculatorPage {
const opt = options[o];
res.push(await opt.getText())
}
- // FIXME>>>>await sel.sendKeys(protractor.Key.ESCAPE); // close dropdown
- // await sel.keys('Escape'); // close dropdown
await browser.keys(Key.Escape); // close dropdown
await browser.pause(500);
return res;
@@ -135,7 +88,6 @@ export class CalculatorPage {
async getMatselectCurrentOptionText(select): Promise<string> {
const currentOption = await this.getSelectCurrentOption(select);
await browser.pause(100);
- // return await currentOption.$("span span").getText();
const opt = await currentOption.$("span span");
await browser.pause(100);
const res = await opt.getText();
@@ -145,7 +97,7 @@ export class CalculatorPage {
getSelectById(id: string) {
// return $(`#${id}`);
- return $(`mat-select[id='${id}']`); // IDs cannot by a number, so use this query form
+ return $(`mat-select[id='${id}']`); // IDs cannot start by a number, so use this query form
}
async isMatSelectPresent(id: string) {
@@ -170,11 +122,11 @@ export class CalculatorPage {
getInputById(id: string) {
// return $(`#${id}`);
- return $(`input[id='${id}']`); // IDs cannot by a number, so use this query form
+ return $(`input[id='${id}']`); // IDs cannot start by a number, so use this query form
}
getNgInputById(id: string) {
- return $(`ngparam-input input[id='${id}']`); // IDs cannot by a number, so use this query form
+ return $(`ngparam-input input[id='${id}']`); // IDs cannot start by a number, so use this query form
}
getSaveSessionButton() {
@@ -221,12 +173,6 @@ export class CalculatorPage {
return $$("fixedvar-results var-results table tbody tr");
}
- // scrollTo(elt: ElementFinder) {
- // browser.controlFlow().execute(function () {
- // browser.executeScript("arguments[0].scrollIntoView(true)", elt.getWebElement());
- // });
- // }
-
getFixedResultsTable() {
return $(".fixed-results-inner-container table");
}
@@ -246,7 +192,6 @@ export class CalculatorPage {
}
async isNgParamPresent(id: string) {
- // const inp = $("ngparam-input input#" + id);
const inp = await this.getNgInputById(id);
return await inp.isExisting();
}
@@ -256,12 +201,7 @@ export class CalculatorPage {
*/
async getInputRadioButton(input, mode: string) {
const tag = await input.getTagName();
- // this function may not be called with an input but a param-field-line
const root = tag === "input" ? await this.findParentContainer(input) : input;
- // get parent (div.container)
- // const container = ;
- // find radio button
- // return await root.$(`mat-button-toggle.radio_${mode} > button`);
return await root.$(`mat-button-toggle.radio_${mode}`);
}
@@ -270,34 +210,20 @@ export class CalculatorPage {
*/
async getInputRadioButtonFromId(id, mode) {
const input = await this.getInputById(id);
- // get parent (div.container)
- // const container = await this.findParentContainer(input);
- // // find radio button
- // return await container.$(`mat-button-toggle.radio_${mode} > button`);
return await this.getInputRadioButton(input, mode);
}
async inputHasCalcModeButton(input) {
- // // get parent (div.container)
- // const container = await this.findParentContainer(input);
- // // find radio buttons
- // const button = await container.$("mat-button-toggle.radio_cal > button");
const button = await this.getInputRadioButton(input, "cal");
return await button.isExisting();
}
async inputHasLinkModeButton(input) {
- // // get parent (div.container)
- // const container = await this.findParentContainer(input);
- // // find radio buttons
- // const button = container.$("mat-button-toggle.radio_link > button");
const button = await this.getInputRadioButton(input, "link");
return await button.isExisting();
}
async isRadioButtonChecked(radio) {
- // return (await radio.getAttribute("ng-reflect-checked")) === "true";
- // if (await radio.getTagName() !== "mat-radio-button") {
if (await radio.getTagName() !== "mat-button-toggle") {
radio = await this.getParentElement(radio);
}
@@ -309,10 +235,6 @@ export class CalculatorPage {
* @returns true if "fixed mode" button linked to an input is selected
*/
async inputIsInFixedMode(input): Promise<boolean> {
- // // get parent (div.container)
- // const container = await this.findParentContainer(input);
- // // find fixed radio button
- // const button = container.$("mat-button-toggle.radio_fix");
const button = await this.getInputRadioButton(input, "fix");
return (await button.getAttribute("ng-reflect-checked")) === "true";
}
@@ -321,10 +243,6 @@ export class CalculatorPage {
* @returns true if "calculated mode" button linked to an input is selected
*/
async inputIsInCalculatedMode(input): Promise<boolean> {
- // // get parent (div.container)
- // const container = await this.findParentContainer(input);
- // // find calc radio button
- // const button = container.$("mat-button-toggle.radio_cal");
const button = await this.getInputRadioButton(input, "cal");
return (await button.getAttribute("ng-reflect-checked")) === "true";
}
@@ -333,10 +251,6 @@ export class CalculatorPage {
* @returns true if "linked mode" button linked to an input is selected
*/
async inputIsInLinkedMode(input): Promise<boolean> {
- // // get parent (div.container)
- // const container = await this.findParentContainer(input);
- // // find calc radio button
- // const button = container.$("mat-button-toggle.radio_link");
const button = await this.getInputRadioButton(input, "link");
return (await button.getAttribute("ng-reflect-checked")) === "true";
}
@@ -361,11 +275,7 @@ export class CalculatorPage {
async presentAndVisible(selector: string) {
const elt = await $(selector);
- // return (await elt.isExisting()) && (await elt.isDisplayed());
- // console.log("presentAndVisible isExisting", selector, await elt.isExisting())
- // console.log("presentAndVisible isDisplayed", selector, await elt.isDisplayed())
const res = (await elt.isExisting()) && (await elt.isDisplayed());
- // console.log("res", selector, res);
return res;
}
@@ -459,7 +369,6 @@ export class CalculatorPage {
async findParentContainer(elt) {
let i = 8; // garde fous
while (((await elt.getAttribute("class")) !== "container") && (i >= 0)) {
- // elt = await elt.$("..");
elt = await this.getParentElement(elt)
i--;
}
@@ -491,12 +400,7 @@ export class CalculatorPage {
async setParamMode(elt, mode: string) {
await scrollToElement(elt);
await browser.pause(100);
- // // get parent (div.container)
- // const container = await this.findParentContainer(elt);
- // // find radio buttons
- // const button = await container.$("mat-button-toggle.radio_" + mode + " > button");
const button = await this.getInputRadioButton(elt, mode);
- //await scrollPageToTop(); // sometimes button slides behind navbar and click() fails
await button.click();
// for "var" mode, close the modal
if (mode === "var") {
@@ -510,28 +414,6 @@ export class CalculatorPage {
}
}
- async setParamMode2(paramFieldLine, mode: string) {
- // await elt.scrollIntoView({ block: 'center', inline: 'center' });
- // await paramFieldLine.waitForDisplayed();
- // await paramFieldLine.scrollIntoView({ block: 'center' });
-
- // browser.executeScript("document.querySelector('#countries').scrollIntoView()")
- //await browser.execute(e => { e.scrollIntoView({ block: 'center' }) }, paramFieldLine);
- await scrollToElement(paramFieldLine);
- // await browser.pause(100);
- // get parent (div.container)
- const button = await paramFieldLine.$("mat-button-toggle.radio_" + mode + " > button");
- //await scrollPageToTop(); // sometimes button slides behind navbar and click() fails
- await button.click();
- // for "var" mode, close the modal
- if (mode === "var") {
- await browser.pause(500); // wait for the modal to appear
- //await element(by.css("dialog-edit-param-values .mat-dialog-actions button")).click(); // clique "annuler" et non "valider" :
- await $("dialog-edit-param-values .mat-dialog-actions button.mat-warn").click();
- await browser.pause(500); // wait for the navbar to reappear after modal dismissal
- }
- }
-
/**
* @param elt an <input> element
*/
@@ -552,7 +434,6 @@ export class CalculatorPage {
const values = {};
for (const i of inputs) {
const inputId = await i.getAttribute("id");
- // const inputValue = await i.getAttribute("value");
const inputValue = await i.getValue();
values[inputId] = +inputValue; // cast to number to avoid false negative (integers starting with 0)
};
@@ -571,7 +452,6 @@ export class CalculatorPage {
const isN = id.includes("_N"); // @TODO strengthen this clodo test
// Ob in Grille is set to 0.5 but cannot exceed 0.58; do not touch it
const isOb = id === "Ob";
- // const value = await i.getAttribute("value");
const value = await i.getValue();
const hasDot = value.includes(".");
const hasExponent = value.includes("e");
@@ -593,7 +473,6 @@ export class CalculatorPage {
*/
async checkEmptyInput(id: string, empty: boolean = true) {
const inp = await this.getInputById(id);
- // const val = inp.getAttribute("value");
const val = await inp.getValue()
if (empty) {
expect(val).toEqual("");
@@ -612,7 +491,6 @@ export class CalculatorPage {
let n = 0;
for (const id of inputIds) {
const inp = await this.getInputById(id);
- // const txt = await inp.getAttribute("value");
const txt = await inp.getValue();
expect(txt === "").toEqual(emptys[n]);
n++;
@@ -639,7 +517,6 @@ export class CalculatorPage {
}
async closeSnackBar() {
- // const sb = $(".mat-simple-snackbar-action");
const sb = $("simple-snack-bar button");
if ((await sb.isExisting()) && (await sb.isDisplayed())) {
await sb.click();
diff --git a/e2e/check-translations.e2e-spec.ts b/e2e/check-translations.e2e-spec.ts
index cd06561de0fb982381ba9561c4ab81c00d393176..0fa31f1feabcb8750719569fb05c595dc892f08c 100644
--- a/e2e/check-translations.e2e-spec.ts
+++ b/e2e/check-translations.e2e-spec.ts
@@ -79,9 +79,7 @@ describe("ngHyd − check translation of all calculators", () => {
}
// check absence of "*** message not found" in whole DOM
- // const source = document.body.innerHTML;
const source = await browser.execute("return document.body.innerHTML");
- // expect(await browser.getSource()).not.toContain("*** message not found", "missing translations found");
expect(source).not.toContain("*** message not found", "missing translations found");
// empty session
diff --git a/e2e/clone-all-calc.e2e-spec.ts b/e2e/clone-all-calc.e2e-spec.ts
index 3520cd7d972da467fe2a9f333182dffcaf1268ec..b7df3462329b469a851e04a3680d808ee116360a 100644
--- a/e2e/clone-all-calc.e2e-spec.ts
+++ b/e2e/clone-all-calc.e2e-spec.ts
@@ -30,7 +30,6 @@ describe("ngHyd − clone all calculators with all possible <select> values", ()
await prefPage.navigateTo();
await prefPage.disableEvilEmptyFields();
await browser.pause(200);
-
await navBar.clickNewCalculatorButton();
});
@@ -64,12 +63,12 @@ describe("ngHyd − clone all calculators with all possible <select> values", ()
await scrollPageToTop();
await calcPage.clickCloneCalcButton();
await browser.pause(300);
-
+
// check existence of the cloned module
expect(await navBar.getAllCalculatorTabs().length).toBe(2);
-
+
// @TODO check <select> values
-
+
// read all <input> values and compare them to stored ones
const cloneValues = await calcPage.storeAllInputValues();
for (const k in cloneValues) {
diff --git a/e2e/clone-calc.e2e-spec.ts b/e2e/clone-calc.e2e-spec.ts
index f52677838af1dc9d88aae730f8a5169b7f0c6032..e6eff73a3478581468e3d6a5b9146b62a0ce829a 100644
--- a/e2e/clone-calc.e2e-spec.ts
+++ b/e2e/clone-calc.e2e-spec.ts
@@ -76,11 +76,8 @@ describe("ngHyd − clone a calculator", () => {
await browser.pause(500);
// 5. compare values
- // Object.keys(sourceValues).forEach(async (k) => {
- // const v = sourceValues[k];
for (const k in sourceValues) {
const v = sourceValues[k];
- // const displayedVal = await calcPage.getInputById(k).getAttribute("value");
const inp = await calcPage.getInputById(k);
const displayedVal = await inp.getValue();
expect(displayedVal).toBe("" + v);
diff --git a/e2e/examples-empty-fields.e2e-spec.ts b/e2e/examples-empty-fields.e2e-spec.ts
index 2c619e644376826a06b7bfc624c7c9cf75a4869e..5c3ea962804400dfa8b64c14ab270c2c593fdea7 100644
--- a/e2e/examples-empty-fields.e2e-spec.ts
+++ b/e2e/examples-empty-fields.e2e-spec.ts
@@ -52,10 +52,6 @@ describe("ngHyd - Check that examples fields are not empty with 'empty fields on
it("calculated parameter initial value when discharge law is modified", async () => {
await newSession(navBar, sideNav);
- // start page
- // await navBar.clickNewCalculatorButton();
- // await browser.pause(200);
-
// open 1st example
const examples = await $$("#examples-list .load-example");
await examples[0].click();
@@ -76,10 +72,7 @@ describe("ngHyd - Check that examples fields are not empty with 'empty fields on
await browser.pause(200);
// check input value is not null
- // const input = await calcPage.getInputById("initval-input");
- // const underlyingInput = await input.$("#0_h1");
const underlyingInput = await $("ngparam-input input.form-control[id='0_h1']");
- // const txt = await underlyingInput.getAttribute("value");
const txt = await underlyingInput.getValue();
expect(txt === "").toEqual(false);
});
@@ -109,10 +102,6 @@ describe("ngHyd - Check that examples work with 'empty fields on calculator crea
it("when calculation is run on a generated fish ladder calculator", async () => {
await newSession(navBar, sideNav);
- // start page
- // await navBar.clickNewCalculatorButton();
- // await browser.pause(200);
-
// open 1st example
const examples = await $$("#examples-list .load-example");
await examples[0].click();
diff --git a/e2e/helpers/GremlinHelper.ts b/e2e/helpers/GremlinHelper.ts
index 434ffd8607861575a5771dd8766fba2d37160168..99f9c19b61761e028cb59efec59a82e408a1bfd4 100644
--- a/e2e/helpers/GremlinHelper.ts
+++ b/e2e/helpers/GremlinHelper.ts
@@ -18,7 +18,6 @@ function findFpsMessages(log: any[]) {
}
export function readGremlinsScript(): string {
- // return readFileSync(__dirname + "/gremlins.min.js", "UTF-8");
return readFileSync(__dirname + "/gremlins.min.js", "utf-8");
}
diff --git a/e2e/link-parallel-devices.e2e-spec.ts b/e2e/link-parallel-devices.e2e-spec.ts
index b4d62ae25c73c531f65a1928ac838c70defe129c..5bae9aa32ad4168954a5f71e71516edd8edffedd 100644
--- a/e2e/link-parallel-devices.e2e-spec.ts
+++ b/e2e/link-parallel-devices.e2e-spec.ts
@@ -41,7 +41,6 @@ describe("ngHyd − parallel structures with multiple linked parameters − ", (
it("when creating Cloisons, devices should be linkable to one another", async () => {
await newSession(navBar, sideNav);
- // await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(10);
await browser.pause(200);
const addBtn = await calcPage.getAddStructureButton();
@@ -53,7 +52,6 @@ describe("ngHyd − parallel structures with multiple linked parameters − ", (
it("when creating Dever, devices should be linkable to one another", async () => {
await newSession(navBar, sideNav);
- // await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(9);
await browser.pause(200);
const addBtn = await calcPage.getAddStructureButton();
diff --git a/e2e/list.po.ts b/e2e/list.po.ts
index 83e65b63ec2be3e24fc2b1946fc7286ccb48fc88..8572f152d7b2453783d239751f0b24bc47bc4a1e 100644
--- a/e2e/list.po.ts
+++ b/e2e/list.po.ts
@@ -46,7 +46,6 @@ export class ListPage {
async clickMenuEntryForCalcType(type: number) {
const but = await $("#create-calc-" + type);
return await but.click();
- // await browser.execute(e => { e.click() }, but); // await but.click() fails with "element not interactable" error
}
async getCalcMenuTextForCalcType(type: number): Promise<string> {
diff --git a/e2e/load-linked-params.e2e-spec.ts b/e2e/load-linked-params.e2e-spec.ts
index 02d856f7ffc5c743e98783cdbd763da5b8573552..cb55bcb066d315eb7d78c72ace1563dc074b28f1 100644
--- a/e2e/load-linked-params.e2e-spec.ts
+++ b/e2e/load-linked-params.e2e-spec.ts
@@ -84,14 +84,12 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
* nghyd#551
*/
const inpZ2 = await calcPage.getInputById("Z2");
- // expect(await inpZ2.getAttribute("value")).toEqual("");
expect(await inpZ2.getValue()).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 = await calcPage.getInputById("1_L");
- // expect(await inpL.getAttribute("value")).toEqual("");
expect(await inpL.getValue()).toEqual("");
const lo_w = await calcPage.getSelectById("2_linked_W");
@@ -107,7 +105,6 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
// const lo_brv = await calcPage.getSelectValueText(lo_br);
// expect(lo_brv).toContain("Largeur au miroir (Sec. param.)");
const inpBR = await calcPage.getInputById("BR");
- // expect(await inpBR.getAttribute("value")).toEqual("");
expect(await inpBR.getValue()).toEqual("");
});
});
diff --git a/e2e/load-save-session.e2e-spec.ts b/e2e/load-save-session.e2e-spec.ts
index 3ddf46ce759b00782f1b27f1c0e8e644c305df34..405f779b05882b90277bd63b0274fe0f22a5e210 100644
--- a/e2e/load-save-session.e2e-spec.ts
+++ b/e2e/load-save-session.e2e-spec.ts
@@ -79,7 +79,6 @@ describe("ngHyd − save and load sessions", () => {
beforeEach(() => {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 45 * 60 * 1000; // 45 min
- // browser.manage().window().setPosition(2000, 30);
});
it("when loading session-6-calc.test.json file from home page, 6 calculators should be loaded", async () => {
@@ -113,10 +112,7 @@ describe("ngHyd − save and load sessions", () => {
await changeSelectValue(await calcPage.getSelectById("select_section"), 2); // mode "trapezoidal"
const inpKs = await calcPage.getInputById("Ks");
- // await inpKs.clearValue(); // coefficient de Strickler
- // await browser.pause(200);
await inpKs.setValue("42");
- // await browser.pause(200);
const filename = await saveSession();
await browser.pause(500);
@@ -135,7 +131,6 @@ describe("ngHyd − save and load sessions", () => {
await browser.pause(200);
const calcTypes = await listPage.getAvailableCalcTypes();
- // const calcTypes = [10];
const excludedCalculators = [
34, // vérificateur (nécessite d'ouvrir plusieurs calculettes)
@@ -170,7 +165,6 @@ describe("ngHyd − save and load sessions", () => {
const selects = await calcPage.getAllCalculatorSelects();
const nsel = selects.length;
for (let s = 0; s < nsel; s++) {
- // const sel = selects.get(s);
const sel = selects[s];
const selId = await sel.getAttribute("id");
diff --git a/e2e/navbar.po.ts b/e2e/navbar.po.ts
index 3e9d2ceea81cf3f271e939956a38a38fc1362c38..f1fa0a1e58ea247f1b41b19f78e90165e5f932e3 100644
--- a/e2e/navbar.po.ts
+++ b/e2e/navbar.po.ts
@@ -18,12 +18,9 @@ export class Navbar {
await dropDown.click();
browser.pause(100);
const options = await $$(".cdk-overlay-container mat-option");
- // FIXME>>>>await dropDown.sendKeys(protractor.Key.ESCAPE); // close dropdown
- //await dropDown.keys('Escape'); // close dropdown
await browser.keys(Key.Escape); // close dropdown
return options.length;
} else {
- // return (await $$("#tabs-container button.calculator-button")).length;
return (await this.getAllCalculatorTabs()).length;
}
}
@@ -63,9 +60,6 @@ export class Navbar {
async clickCalculatorTab(n: number) {
const tabs = await this.getAllCalculatorTabs();
- // await (await tabs.n).click();
-
- // await tabs[n].click();
await browser.execute(e => { e.click() }, tabs[n]); // await tabs[n].click() fails with "element not interactable" error
}
@@ -79,7 +73,6 @@ export class Navbar {
const l = tabs.length;
const r = Math.min((Math.floor(Math.random() * l)), (l - 1));
- //await tabs[r].click();
await browser.execute(e => { e.click() }, tabs[r]); // await tabs[r].click() fails with "element not interactable" error
}
@@ -89,7 +82,6 @@ export class Navbar {
*/
async middleClickCalculatorTab(n: number, confirmCloseDialog: boolean = true) {
const calcTabs = await this.getAllCalculatorTabs();
- // FIXME>>>> await browser.actions().click(calcTabs.get(n), Button.MIDDLE).perform();
await calcTabs[n].click({ button: 'middle' });
if (confirmCloseDialog) {
const btns = await $$("dialog-confirm-close-calc .mat-dialog-actions button");
diff --git a/e2e/navigate-through-calculators.e2e-spec.ts b/e2e/navigate-through-calculators.e2e-spec.ts
index 85f0d0c5384858947298a50abf5d287cbcba3444..6e4e7ae7932d509520bd4003b8cc08be4a02afd6 100644
--- a/e2e/navigate-through-calculators.e2e-spec.ts
+++ b/e2e/navigate-through-calculators.e2e-spec.ts
@@ -34,7 +34,6 @@ describe("ngHyd − create calculators and navigate among them", () => {
await browser.pause(200);
// test all form labels
const labels = await calculatorPage.getInputLabels();
- //await labels.each(async (l) => {
for (const l of labels) {
const label = await l.getText();
expect(label.length).toBeGreaterThan(0);
diff --git a/e2e/pab.e2e-spec.ts b/e2e/pab.e2e-spec.ts
index 21b75dac92344d863fecae2a72679538b40870ef..acdab5e0bd9c023466beba7186d576274eb9c15f 100644
--- a/e2e/pab.e2e-spec.ts
+++ b/e2e/pab.e2e-spec.ts
@@ -61,10 +61,8 @@ describe("ngHyd − Passe à Bassins", () => {
await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(12);
const c_Z1 = await calcPage.getInputById("Z1");
- // await c_Z1.clearValue();
await c_Z1.setValue("78.27");
const c_Z2 = await calcPage.getInputById("Z1");
- // await c_Z2.clearValue();
await c_Z2.setValue("74.86");
// PAB - nombre
@@ -84,13 +82,10 @@ describe("ngHyd − Passe à Bassins", () => {
const d_V = await calcPage.getInputById("V");
await calcPage.setParamMode(d_V, "cal");
const d_Y = await calcPage.getInputById("Y");
- // await d_Y.clearValue();
await d_Y.setValue("1.5");
const d_L = await calcPage.getInputById("L");
- // await d_L.clearValue();
await d_L.setValue("3.100");
const d_W = await calcPage.getInputById("W");
- // await d_W.clearValue();
await d_W.setValue("2.5");
// PAB - puissance dissipée (volume)
@@ -118,7 +113,6 @@ describe("ngHyd − Passe à Bassins", () => {
const cl_Z1 = await calcPage.getInputById("Z1");
await calcPage.setParamMode(cl_Z1, "link");
const cl_PB = await calcPage.getInputById("PB");
- // await cl_PB.clearValue();
await cl_PB.setValue("1.5");
// calculate Cloisons
@@ -135,7 +129,6 @@ describe("ngHyd − Passe à Bassins", () => {
await genButton.click();
await browser.pause(1000);
const nbBassins = await calcPage.getInputById("generatePabNbBassins");
- // await nbBassins.clearValue();
await nbBassins.setValue("9");
// click "Generate"
@@ -167,7 +160,6 @@ describe("ngHyd − Passe à Bassins", () => {
await newSession(navBar, sideNav);
// create many Cloisons
- // await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(10);
await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(10);
@@ -176,13 +168,10 @@ describe("ngHyd − Passe à Bassins", () => {
// choose one of them and change its parameters
await navBar.clickCalculatorTab(1);
const Z1 = await calcPage.getInputById("Z1");
- // await Z1.clearValue();
await Z1.setValue("114");
const LB = await calcPage.getInputById("LB");
- // await LB.clearValue();
await LB.setValue("11.5");
const DH = await calcPage.getInputById("DH");
- // await DH.clearValue();
await DH.setValue("0.72");
// calculate Cloisons
@@ -198,22 +187,15 @@ describe("ngHyd − Passe à Bassins", () => {
await browser.pause(1000);
const debit = await calcPage.getInputById("generatePabDebit");
expect(await debit.getValue()).toBe("0.564");
- // await debit.clearValue();
- // await browser.pause(300);
// send "1.6" in 3 movements, because "." triggers an error and Angular can't cope with the subsequent keys
await debit.setValue("1");
- // await browser.pause(50);
await debit.addValue(".");
- // await browser.pause(50);
await debit.addValue("6");
- // await browser.pause(50);
const coteAmont = await calcPage.getInputById("generatePabCoteAmont");
expect(await coteAmont.getValue()).toBe("114");
- // await coteAmont.clearValue();
await coteAmont.setValue("115");
const nbBassins = await calcPage.getInputById("generatePabNbBassins");
expect(await nbBassins.getValue()).toBe("6");
- // await nbBassins.clearValue();
await nbBassins.setValue("5");
// click "Generate"
diff --git a/e2e/parallel-structures.e2e-spec.ts b/e2e/parallel-structures.e2e-spec.ts
index f1dff37847f672118a377df88450c940eca0291c..1abbb20329248b2c7da2b47584af9ba2b81cf344 100644
--- a/e2e/parallel-structures.e2e-spec.ts
+++ b/e2e/parallel-structures.e2e-spec.ts
@@ -46,7 +46,6 @@ describe("Check calculated parameter remains the same when copying a structure",
// copy 1st structure
const copyStruct = await calcPage.getCopyStructureButton();
- // await copyStruct.click();
await browser.execute(e => { e.click() }, copyStruct); // await copyStruct.click() fails with "element not interactable" error
await browser.pause(200);
diff --git a/e2e/predam-empty-fields.e2e-spec.ts b/e2e/predam-empty-fields.e2e-spec.ts
index 0915297ae979badbb20dd13e5afd2035a8e6e3bb..66ad0806c7097a60474f2e873dbdc02dc17ea55c 100644
--- a/e2e/predam-empty-fields.e2e-spec.ts
+++ b/e2e/predam-empty-fields.e2e-spec.ts
@@ -50,7 +50,6 @@ describe("ngHyd − check that predam fields are empty", () => {
// check walls inputs
const walls = await $$("g.node.wall");
expect(walls.length).toEqual(2);
- // await walls.each(async (w) => {
for (const w of walls) {
await w.click();
await browser.pause(200);
@@ -80,13 +79,11 @@ describe("ngHyd − check that predam fields are empty", () => {
// check "surface" input is empty
let inp = await calcPage.getInputById("3_S");
- // let txt = await inp.getAttribute("value");
let txt = await inp.getValue();
expect(txt).toEqual("");
// check "cote de fond" input is empty
inp = await calcPage.getInputById("3_ZF");
- // txt = await inp.getAttribute("value");
txt = await inp.getValue();
expect(txt).toEqual("");
});
@@ -112,14 +109,12 @@ describe("ngHyd − check that predam fields are empty", () => {
// check L input is empty
inp = await calcPage.getInputById("0_L");
- // txt = await inp.getAttribute("value");
txt = await inp.getValue();
expect(txt).toEqual("");
// check CdWSL input is empty (in this case, the structure happens to be a Larinier weir
// which discharge coefficient must be empty)
inp = await calcPage.getInputById("0_CdWSL");
- // txt = await inp.getAttribute("value");
txt = await inp.getValue();
expect(txt).toEqual("");
});
diff --git a/e2e/predam-log.e2e-spec.ts b/e2e/predam-log.e2e-spec.ts
index 85b7b59513d23f8c5d200b554ac781cf838252f8..11326ca7b30206e7257009c10ad00cdef48ee4bc 100644
--- a/e2e/predam-log.e2e-spec.ts
+++ b/e2e/predam-log.e2e-spec.ts
@@ -26,8 +26,6 @@ describe("check that low iteration count leads to log messages", () => {
});
it("", async () => {
- // browser.manage().window().setPosition(2000, 30);
-
// set low iteration count
await prefPage.setIterationCount(5);
@@ -35,7 +33,7 @@ describe("check that low iteration count leads to log messages", () => {
await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(30);
await browser.pause(200);
-
+
// run calculation
const calcButton = await calcPage.getCalculateButton();
await calcButton.click();
diff --git a/e2e/preferences.e2e-spec.ts b/e2e/preferences.e2e-spec.ts
index 0e09c1128b48f0884c58d060bcd518d74c862db8..761ab3ae19287d3003d0bbd9213f907252832b18 100644
--- a/e2e/preferences.e2e-spec.ts
+++ b/e2e/preferences.e2e-spec.ts
@@ -23,7 +23,6 @@ describe("ngHyd − preferences page", () => {
it("when preferences are open, no label should be empty", async () => {
const labels = await page.getInputLabels();
- // await labels.each(async (l) => {
for (const l of labels) {
const label = await l.getText();
expect(label.length).toBeGreaterThan(0);
@@ -32,10 +31,8 @@ describe("ngHyd − preferences page", () => {
it("when preferences are open, no input field should be empty", async () => {
const numericFields = await page.getNumericFormFields();
- // await numericFields.each(async (nf) => {
for (const nf of numericFields) {
const input = await page.getInputForField(nf);
- // const val = await input.getAttribute("value");
const val = await input.getValue();
expect(val).toBeTruthy();
};
@@ -43,24 +40,18 @@ describe("ngHyd − preferences page", () => {
it("when erroneous values are input, errors should appear", async () => {
const numericFields = await page.getNumericFormFields();
- // await numericFields.each(async (nf) => {
for (const nf of numericFields) {
const inp = await page.getInputForField(nf);
// add a letter after the numerical value
- // await page.getInputForField(nf).addValue("d");
await inp.addValue("d");
let errorField = await page.getErrorsForField(nf);
expect(await errorField.isExisting()).toBe(true);
// empty input
- // await page.getInputForField(nf).clearValue();
await inp.clearValue();
- // expect(page.getErrorsForField(nf).isExisting()).toBe(true);
errorField = await page.getErrorsForField(nf);
expect(await errorField.isExisting()).toBe(true);
// send bad value
- // await page.getInputForField(nf).setValue("50000");
await inp.setValue("50000");
- // expect(page.getErrorsForField(nf).isExisting()).toBe(true);
errorField = await page.getErrorsForField(nf);
expect(await errorField.isExisting()).toBe(true);
};
@@ -68,15 +59,11 @@ describe("ngHyd − preferences page", () => {
it("when correct values are input, errors should disappear", async () => {
const numericFields = await page.getNumericFormFields();
- // await numericFields.each(async (nf) => {
for (const nf of numericFields) {
// send correct value
const inp = await page.getInputForField(nf);
- // await page.getInputForField(nf).clearValue();
- // await page.getInputForField(nf).setValue("1");
await inp.setValue("1");
const errorField = await page.getErrorsForField(nf);
- // expect(page.getErrorsForField(nf).isExisting()).toBe(false);
expect(await errorField.isExisting()).toBe(false);
};
});
diff --git a/e2e/preferences.po.ts b/e2e/preferences.po.ts
index ea44297946408147c1f10c11b42661859926a1e7..4a3a5755cc3ebf7aec84f2e198608662da8ff6fc 100644
--- a/e2e/preferences.po.ts
+++ b/e2e/preferences.po.ts
@@ -82,7 +82,6 @@ export class PreferencesPage {
async setIterationCount(n: number) {
const input = await this.getInputFromName("nmi");
- // input.clearValue();
await input.setValue(n.toString());
}
}
diff --git a/e2e/pressure-loss.e2e-spec.ts b/e2e/pressure-loss.e2e-spec.ts
index e4d6e530c70adef28e6bcb55704448c84c04ac84..1e8d1e21f81ddf411485abbb0a51dc1842f7115e 100644
--- a/e2e/pressure-loss.e2e-spec.ts
+++ b/e2e/pressure-loss.e2e-spec.ts
@@ -49,8 +49,6 @@ describe("Pressure loss - ", () => {
});
it("Strickler", async () => {
- // browser.manage().window().setPosition(2000, 30);
-
// open "pressure loss" calculator
await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(35);
diff --git a/e2e/reset-param-mode.e2e-spec.ts b/e2e/reset-param-mode.e2e-spec.ts
index d5e85ef809844e9356429aded6f990d0ee8c7ca1..1a1c7ac6ff11db6050bdc8e921057f6a6a87220c 100644
--- a/e2e/reset-param-mode.e2e-spec.ts
+++ b/e2e/reset-param-mode.e2e-spec.ts
@@ -17,8 +17,6 @@ describe("ngHyd - check parameter mode is set to its previous value - ", () => {
beforeAll(() => {
listPage = new ListPage();
- // navBar = new Navbar();
- // sideNav = new SideNav();
calcPage = new CalculatorPage();
});
@@ -32,13 +30,11 @@ describe("ngHyd - check parameter mode is set to its previous value - ", () => {
await browser.pause(200);
// click "calc" radio on Z1 parameter
- // const z1calcbtn = await $("#mat-button-toggle-3");
const z1calcbtn = await calcPage.getInputRadioButtonFromId("Z1", "cal");
await z1calcbtn.click();
await browser.pause(200);
// click "var" radio on Z1 parameter
- // const z1varbtn = await $("#mat-button-toggle-2");
const z1varbtn = await calcPage.getInputRadioButtonFromId("Z1", "var");
await z1varbtn.click();
await browser.pause(200);
@@ -49,11 +45,9 @@ describe("ngHyd - check parameter mode is set to its previous value - ", () => {
await browser.pause(500);
// check Z1 var toggle is not checked
- // expect(await z1varbtn.getASttribute("ng-reflect-checked")).toBe("false");
expect(await calcPage.isRadioButtonChecked(z1varbtn)).toEqual(false);
// check Z1 calc toggle is checked
- // expect(await z1calcbtn.getAttribute("ng-reflect-checked")).toBe("true");
expect(await calcPage.isRadioButtonChecked(z1calcbtn)).toEqual(true);
});
@@ -61,26 +55,19 @@ describe("ngHyd - check parameter mode is set to its previous value - ", () => {
// start page
await listPage.navigateTo();
await browser.pause(300);
- // await newSession(navBar, sideNav);
// open PAB calculator
await listPage.clickMenuEntryForCalcType(15);
await browser.pause(500);
// "fixed" radio on Q parameter
- // const qfixbtn = await $("#mat-button-toggle-1");
const qfixbtn = await calcPage.getInputRadioButtonFromId("Q", "fix");
- // await browser.pause(50);
// "var" radio on Z1 parameter
- // const z1varbtn = await $("#mat-button-toggle-6");
const z1varbtn = await calcPage.getInputRadioButtonFromId("Z1", "var");
- // await browser.pause(50);
// "calc" radio on Z1 parameter
- // const z1calcbtn = await $("#mat-button-toggle-7");
const z1calcbtn = await calcPage.getInputRadioButtonFromId("Z1", "cal");
- // await browser.pause(50);
// click "var" radio on Z1 parameter
await z1varbtn.click();
@@ -92,11 +79,9 @@ describe("ngHyd - check parameter mode is set to its previous value - ", () => {
await browser.pause(500);
// check Q fix toggle is checked
- // expect(await qfixbtn.getAttribute("ng-reflect-checked")).toBe("true");
expect(await calcPage.isRadioButtonChecked(qfixbtn)).toEqual(true);
// check Z1 calc toggle is checked
- // expect(await z1calcbtn.getAttribute("ng-reflect-checked")).toBe("true");
expect(await calcPage.isRadioButtonChecked(z1calcbtn)).toEqual(true);
});
});
diff --git a/e2e/reset-results.e2e-spec.ts b/e2e/reset-results.e2e-spec.ts
index 5811449db5655390cbc4ceb8ac56c0ef37e5735c..210e11a2c84f209698d0260b66d3eaa13067d9af 100644
--- a/e2e/reset-results.e2e-spec.ts
+++ b/e2e/reset-results.e2e-spec.ts
@@ -32,10 +32,7 @@ describe("Check results are reset after application settings modification - ", (
async function runTestWithParameter(param: string, val1: number, val2: number) {
// set starting compute precision
const input = await prefPage.getInputFromName(param);
- // await input.clearValue();
- // await browser.pause(20);
await input.setValue(val1.toString());
- // await browser.pause(200);
// open "fish ladder: fall" calculator
await navBar.clickNewCalculatorButton();
@@ -59,8 +56,6 @@ describe("Check results are reset after application settings modification - ", (
await browser.pause(200);
// modify compute precision
- // await input.clearValue();
- // await browser.pause(20);
await input.setValue(val2.toString());
await browser.pause(500);
diff --git a/e2e/sidenav.po.ts b/e2e/sidenav.po.ts
index e7e79bbe231db92db744b13c8498e2694fee3b1f..ab5b15961700fa13815ffc1c8956241f8c38cada 100644
--- a/e2e/sidenav.po.ts
+++ b/e2e/sidenav.po.ts
@@ -23,7 +23,6 @@ export class SideNav {
getFileInput() {
return $(`dialog-load-session input[type="file"]`);
- // return $(`dialog-load-session ngx-mat-file-input`);
}
getFileLoadButton() {
@@ -52,7 +51,6 @@ export class SideNav {
async clickNewSessionButton() {
const ncb = await this.getNewSessionButton();
- // await browser.pause(200);
await ncb.click();
await browser.pause(200);
const cb = await this.getConfirmNewSessionButton();
@@ -62,11 +60,7 @@ export class SideNav {
async loadSessionFile(file: string, click: boolean = true) {
const absolutePath = path.resolve(__dirname, file);
const input = await this.getFileInput();
- // await input.click();
- // await scrollToElement(input)
- // await input.setValue(absolutePath);
await input.addValue(absolutePath);
- // await browser.pause(500);
if (click) {
const btn = await this.getFileLoadButton();
await btn.click();
diff --git a/e2e/solveur.e2e-spec.ts b/e2e/solveur.e2e-spec.ts
index 1aa86e1ddace61d2ed360e254697953115bdc926..ee4008a1f086d55dd44b89a11c60a09d77070fe9 100644
--- a/e2e/solveur.e2e-spec.ts
+++ b/e2e/solveur.e2e-spec.ts
@@ -47,10 +47,8 @@ describe("Solveur - ", () => {
await navBar.clickCalculatorTab(3); // n°3 should be the latest
// check input values
- // expect(await calcPage.getInputById("Xinit").getAttribute("value")).toBe("0.5");
const inpXinit = await calcPage.getInputById("Xinit");
expect(await inpXinit.getValue()).toBe("0.5");
- // expect(await calcPage.getInputById("Ytarget").getAttribute("value")).toBe("252");
const inpYtarget = await calcPage.getInputById("Ytarget");
expect(await inpYtarget.getValue()).toBe("252");
// check Nub to calculate
@@ -86,8 +84,6 @@ describe("Solveur - ", () => {
await newSession(navBar, sideNav);
// 1. create empty Solveur
- // await listPage.clickMenuEntryForCalcType(22); // Solveur
- // await browser.pause(500);
openCalculator(22, navBar, listPage);
// 2. create PAB:Chute, PAB:Nombre and PAB:Puissance linked to one another
@@ -274,9 +270,6 @@ describe("Solveur - nghyd#601 with empty fields option", () => {
it("check removing and recreating solver with empty fields option does not fill target parameter input", async () => {
await newSession(navBar, sideNav);
- // await navBar.clickNewCalculatorButton();
- // await browser.pause(200);
-
// open "channel flow with hydraulic structures" example
const examples = await $$("#examples-list .load-example");
await examples[1].click();
@@ -317,14 +310,6 @@ describe("Solveur - nghyd#601 without empty fields option", () => {
sideNav = new SideNav();
});
- // async function openCalculator(id: number) {
- // await navBar.clickNewCalculatorButton();
- // await browser.pause(200);
-
- // await listPage.clickMenuEntryForCalcType(id);
- // await browser.pause(200);
- // }
-
async function openSolver() {
await openCalculator(22, navBar, listPage);
}
@@ -377,9 +362,6 @@ describe("Solveur - nghyd#601 without empty fields option", () => {
it("check removing and recreating solver without empty fields option fills inputs", async () => {
await newSession(navBar, sideNav);
- // await navBar.clickNewCalculatorButton();
- // await browser.pause(200);
-
// open "channel flow with hydraulic structures" example
const examples = await $$("#examples-list .load-example");
await examples[1].click();
@@ -447,14 +429,6 @@ describe("Solveur - nghyd#606 - a single module cannot be used with solver", ()
sideNav = new SideNav();
});
- // async function openCalculator(id: number) {
- // await navBar.clickNewCalculatorButton();
- // await browser.pause(200);
-
- // await listPage.clickMenuEntryForCalcType(id);
- // await browser.pause(200);
- // }
-
async function openSolver() {
await openCalculator(22, navBar, listPage);
}
diff --git a/e2e/translation.e2e-spec.ts b/e2e/translation.e2e-spec.ts
index 93bcb3f483969cff26b4dd425251737b4fe41133..d87a45a7bb449bbf130778b3656b64b56236842f 100644
--- a/e2e/translation.e2e-spec.ts
+++ b/e2e/translation.e2e-spec.ts
@@ -29,7 +29,6 @@ describe("Check translation", () => {
await prefPage.navigateTo();
await prefPage.changeLanguage(1); // fr
- // await browser.pause(200);
// open "fish ladder: fall" calculator
await navBar.clickNewCalculatorButton();
@@ -55,7 +54,6 @@ describe("Check translation", () => {
// fixed results variables
const frr = await calcPage.getAllFixedResultsRows();
let row0 = frr[0];
- // let lbl1 = await frr.$$("td")[0].getText();
let lbl1 = await row0.$("td").getText();
expect(lbl1).toEqual("Cote amont (m)");
@@ -69,11 +67,6 @@ describe("Check translation", () => {
// *** results in english ***
// setup -> english
- // await navBar.clickMenuButton();
- // await browser.pause(200);
- // const setupBtn = await sideNav.getSetupButton();
- // await setupBtn.click();
- // await browser.pause(200);
await prefPage.navigateTo();
await prefPage.changeLanguage(0); // en
await browser.pause(200);
@@ -90,7 +83,6 @@ describe("Check translation", () => {
// fixed results variables
row0 = frr[0];
- // lbl1 = await frr.$$("td")[0].getText();
lbl1 = await row0.$("td").getText();
expect(lbl1).toEqual("Upstream elevation (m)");
diff --git a/e2e/util.po.ts b/e2e/util.po.ts
index 6e3d63c2eeefa49b0c4f084fa39072819273c022..ffe2d1806cd07679865854744204265744cfd810 100644
--- a/e2e/util.po.ts
+++ b/e2e/util.po.ts
@@ -7,8 +7,6 @@ import { ListPage } from './list.po';
* scroll page to make element visible
*/
export async function scrollToElement(elem) {
- // await browser.execute("arguments[0].scrollIntoView({ block: 'center' });", elem);
- // await browser.pause(50);
await browser.execute(e => { e.scrollIntoView({ block: 'center' }) }, elem);
await browser.pause(100);
}
@@ -18,7 +16,6 @@ export async function scrollToElement(elem) {
*/
export async function scrollPageToTop() {
await browser.execute("window.scrollTo(0, 0);");
- // await browser.scroll(0, 0);
}
/**
diff --git a/e2e/valeurs-erronees.e2e-spec.ts b/e2e/valeurs-erronees.e2e-spec.ts
index 5f2ca99b49e8ec68165e6957a0bf2ef033ad0470..2e88357fc5878b2b66d55996f98d8ddaafc1cf7d 100644
--- a/e2e/valeurs-erronees.e2e-spec.ts
+++ b/e2e/valeurs-erronees.e2e-spec.ts
@@ -33,11 +33,7 @@ describe("ngHyd - check invalid values are removed - ", () => {
// modify W input with invalid value
const inputW = await calcPage.getInputById("W");
- // await browser.pause(200);
- // await inputW.clearValue();
- // await browser.pause(200);
await inputW.setValue("-1");
- // await browser.pause(200);
// open another calculator
await navBar.clickNewCalculatorButton();
@@ -49,9 +45,7 @@ describe("ngHyd - check invalid values are removed - ", () => {
await browser.pause(200);
// check invalid value is removed
- // const w = await inputW.getAttribute("value");
const w = await inputW.getValue();
- // await browser.pause(200);
expect(w).toEqual("");
// check that "compute" button is disabled
diff --git a/e2e/variable-param-cancel.e2e-spec.ts b/e2e/variable-param-cancel.e2e-spec.ts
index 534e3cc9c4cebf25dd2de3c55bdf53b28a39a10e..bc88a473d56a842761d93f2ade711538ccd227ea 100644
--- a/e2e/variable-param-cancel.e2e-spec.ts
+++ b/e2e/variable-param-cancel.e2e-spec.ts
@@ -27,7 +27,6 @@ describe("ngHyd - check cancel button for variable parameters - ", () => {
await browser.pause(200);
// click "var" radio on Z1 parameter
- // const z1btn = $("#mat-button-toggle-2-button");
const z1btn = await calcPage.getInputRadioButtonFromId("Z1", "var");
await z1btn.click();
await browser.pause(300);