From c35640a8dd832864da1d4c3224364666e5d8a5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Fri, 7 Apr 2023 14:59:50 +0200
Subject: [PATCH] fix(e2e): parallel structure submergence warning is also
displayed along with submergence error
refs #614
---
e2e/calculator.po.ts | 11 +++++++++++
e2e/parallel-structures.e2e-spec.ts | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/e2e/calculator.po.ts b/e2e/calculator.po.ts
index 97d0ac1f2..f2d727162 100644
--- a/e2e/calculator.po.ts
+++ b/e2e/calculator.po.ts
@@ -335,6 +335,17 @@ export class CalculatorPage {
return style.indexOf("color: red;") !== -1;
}
+ /**
+ * return true if the nth log entry is a warning
+ */
+ async nthLogEntryIsWarning(n: number) {
+ const errs = element.all(by.css("log-entry"));
+ const e = errs.get(n);
+ const icon = e.element(by.css("div mat-icon"));
+ const style = await icon.getAttribute("style");
+ return style.indexOf("color: orange;") !== -1;
+ }
+
async clickSaveCalcButton() {
await scrollPageToTop();
return await element(by.css("#save-calc")).click();
diff --git a/e2e/parallel-structures.e2e-spec.ts b/e2e/parallel-structures.e2e-spec.ts
index 16e859cb6..f290cab9b 100644
--- a/e2e/parallel-structures.e2e-spec.ts
+++ b/e2e/parallel-structures.e2e-spec.ts
@@ -61,7 +61,6 @@ describe("Parallel structures - ", () => {
});
it("check submergence error", async () => {
- debugger
await startPage.navigateTo();
await loadSession(navBar, sideNav, "./session/session-erreur-ennoiement-614.json");
@@ -77,9 +76,10 @@ describe("Parallel structures - ", () => {
await browser.sleep(500);
// check error message in log
- expect(await calcPage.nbLogEntries()).toBe(1);
+ expect(await calcPage.nbLogEntries()).toBe(2);
- expect(await calcPage.nthLogEntryIsError(0)).toBe(true);
+ expect(await calcPage.nthLogEntryIsWarning(0)).toBe(true);
+ expect(await calcPage.nthLogEntryIsError(1)).toBe(true);
// second calculator
@@ -91,8 +91,9 @@ describe("Parallel structures - ", () => {
await browser.sleep(500);
// check error message in log
- expect(await calcPage.nbLogEntries()).toBe(1);
+ expect(await calcPage.nbLogEntries()).toBe(2);
- expect(await calcPage.nthLogEntryIsError(0)).toBe(true);
+ expect(await calcPage.nthLogEntryIsWarning(0)).toBe(true);
+ expect(await calcPage.nthLogEntryIsError(1)).toBe(true);
});
});
--
GitLab