From 7e7b9eb66342309c4daa58007e7578d914ed7909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 5 Apr 2023 13:42:33 +0200
Subject: [PATCH] fix(e2e): missing await in
CalculatorPage.checkCalcButtonEnabled()
refs #616
---
e2e/calculate-all-params.e2e-spec.ts | 4 ++--
e2e/calculate-button-validation.e2e-spec.ts | 12 ++++++------
e2e/calculate-linked-params.e2e-spec.ts | 2 +-
e2e/calculator.po.ts | 4 ++--
e2e/solveur.e2e-spec.ts | 6 +++---
e2e/valeurs-erronees.e2e-spec.ts | 2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/e2e/calculate-all-params.e2e-spec.ts b/e2e/calculate-all-params.e2e-spec.ts
index 5d0b9280a..f19c2f7d0 100644
--- a/e2e/calculate-all-params.e2e-spec.ts
+++ b/e2e/calculate-all-params.e2e-spec.ts
@@ -74,7 +74,7 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
const nbParamsCalc = await calcPage.getCheckedCalcModeButtons().count();
expect(nbParamsCalc).toBe(1);
// check that "compute" button is active
- const calcButton = calcPage.checkCalcButtonEnabled(true);
+ const calcButton = await calcPage.checkCalcButtonEnabled(true);
// click "compute" button
await calcButton.click();
// check that result is not empty
@@ -84,7 +84,7 @@ describe("ngHyd − calculate all parameters of all calculators", () => {
} else {
// module has no calculable params, just click the "compute" button
// check that "compute" button is active
- const calcButton = calcPage.checkCalcButtonEnabled(true);
+ const calcButton = await calcPage.checkCalcButtonEnabled(true);
// click "compute" button
await calcButton.click();
// check that result is not empty
diff --git a/e2e/calculate-button-validation.e2e-spec.ts b/e2e/calculate-button-validation.e2e-spec.ts
index f98e92093..0f472f43e 100644
--- a/e2e/calculate-button-validation.e2e-spec.ts
+++ b/e2e/calculate-button-validation.e2e-spec.ts
@@ -49,21 +49,21 @@ describe("Calculate button - ", () => {
await browser.sleep(200);
// check that "compute" button is inactive
- calcPage.checkCalcButtonEnabled(false);
+ await calcPage.checkCalcButtonEnabled(false);
// back to PAB: chute
await navBar.clickCalculatorTab(0);
await browser.sleep(200);
// check that "compute" button is active
- calcPage.checkCalcButtonEnabled(true);
+ await calcPage.checkCalcButtonEnabled(true);
// back to PAB: dimensions
await navBar.clickCalculatorTab(1);
await browser.sleep(200);
// check that "compute" button is inactive
- calcPage.checkCalcButtonEnabled(false);
+ await calcPage.checkCalcButtonEnabled(false);
});
describe("check button status in prébarrages - ", () => {
@@ -83,7 +83,7 @@ describe("Calculate button - ", () => {
await inputQ.sendKeys("-1");
await browser.sleep(200);
- calcPage.checkCalcButtonEnabled(false);
+ await calcPage.checkCalcButtonEnabled(false);
// upstream item
// look for g element with id starting by "flowchart-amont-"
@@ -120,7 +120,7 @@ describe("Calculate button - ", () => {
await browser.sleep(200);
// calculate button disabled ?
- calcPage.checkCalcButtonEnabled(false);
+ await calcPage.checkCalcButtonEnabled(false);
// upstream item displayed in error ?
expect(await upstream.getAttribute('class')).toContain("node-highlighted-error"); // upstream item is now selected by default (was 'node-error')
@@ -132,7 +132,7 @@ describe("Calculate button - ", () => {
await browser.sleep(200);
// calculate button still disabled ? (the basin is not connected to anything)
- calcPage.checkCalcButtonEnabled(false);
+ await calcPage.checkCalcButtonEnabled(false);
// upstream item displayed not in error ?
expect(await upstream.getAttribute('class')).not.toContain("node-error");
diff --git a/e2e/calculate-linked-params.e2e-spec.ts b/e2e/calculate-linked-params.e2e-spec.ts
index e7192eca9..f87d9b168 100644
--- a/e2e/calculate-linked-params.e2e-spec.ts
+++ b/e2e/calculate-linked-params.e2e-spec.ts
@@ -45,7 +45,7 @@ describe("ngHyd − calculate with linked parameters", () => {
async function computeAndCheckPresenceOfResults() {
// check that "compute" button is active
- const calcButton = calcPage.checkCalcButtonEnabled(true);
+ const calcButton = await calcPage.checkCalcButtonEnabled(true);
// click "compute" button
await calcButton.click();
// check that result is not empty
diff --git a/e2e/calculator.po.ts b/e2e/calculator.po.ts
index fa9dc5802..d7552190a 100644
--- a/e2e/calculator.po.ts
+++ b/e2e/calculator.po.ts
@@ -335,9 +335,9 @@ export class CalculatorPage {
}
// check that "compute" button is in given enabled/disabled state
- checkCalcButtonEnabled(enabled: boolean) {
+ async checkCalcButtonEnabled(enabled: boolean) {
const calcButton = this.getCalculateButton();
- expect(calcButton.isEnabled()).toBe(enabled);
+ expect(await calcButton.isEnabled()).toBe(enabled);
return calcButton;
}
diff --git a/e2e/solveur.e2e-spec.ts b/e2e/solveur.e2e-spec.ts
index 6ca71d3c7..1b4740864 100644
--- a/e2e/solveur.e2e-spec.ts
+++ b/e2e/solveur.e2e-spec.ts
@@ -63,7 +63,7 @@ describe("Solveur - ", () => {
expect(spV).toContain("Z2 - Cote aval (PAB : chute)");
// check that "compute" button is active
- const calcButton = calcPage.checkCalcButtonEnabled(true);
+ const calcButton = await calcPage.checkCalcButtonEnabled(true);
// click "compute" button
await calcButton.click();
// check that result is not empty
@@ -113,7 +113,7 @@ describe("Solveur - ", () => {
await calcPage.getInputById("Ytarget").sendKeys("318");
// check that "compute" button is active
- const calcButton = calcPage.checkCalcButtonEnabled(true);
+ const calcButton = await calcPage.checkCalcButtonEnabled(true);
// click "compute" button
await calcButton.click();
// check that result is not empty
@@ -134,7 +134,7 @@ describe("Solveur - ", () => {
expect(hasResultsClone1).toBe(false);
// check that "compute" button is active
- const calcButtonClone = calcPage.checkCalcButtonEnabled(true);
+ const calcButtonClone = await calcPage.checkCalcButtonEnabled(true);
// click "compute" button
await calcButtonClone.click();
// check that result is not empty
diff --git a/e2e/valeurs-erronees.e2e-spec.ts b/e2e/valeurs-erronees.e2e-spec.ts
index 8580ae57e..73f815a39 100644
--- a/e2e/valeurs-erronees.e2e-spec.ts
+++ b/e2e/valeurs-erronees.e2e-spec.ts
@@ -54,6 +54,6 @@ describe("ngHyd - check invalid values are removed - ", () => {
expect(w).toEqual("");
// check that "compute" button is disabled
- calcPage.checkCalcButtonEnabled(false);
+ await calcPage.checkCalcButtonEnabled(false);
});
});
--
GitLab