From c863159b11272ea9971c52d187f8ecdd89fee138 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Wed, 13 Feb 2019 15:52:17 +0100
Subject: [PATCH] =?UTF-8?q?M=C3=A0J=20tests=20e2e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 e2e/calculator.e2e-spec.ts                   | 2 +-
 e2e/calculator.po.ts                         | 2 +-
 e2e/navigate-through-calculators.e2e-spec.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/e2e/calculator.e2e-spec.ts b/e2e/calculator.e2e-spec.ts
index 58beabb11..f7e986344 100644
--- a/e2e/calculator.e2e-spec.ts
+++ b/e2e/calculator.e2e-spec.ts
@@ -17,7 +17,7 @@ describe("ngHyd − calculator page", () => {
     expect(text.length).toBeGreaterThan(0);
   });
 
-  it("when a calculator is open, no label should be empty", async () => {
+  it("when a calculator is open, no active label should be empty", async () => {
     const labels = page.getInputLabels();
     await labels.each(async (l) => {
       const label = await l.getText();
diff --git a/e2e/calculator.po.ts b/e2e/calculator.po.ts
index 86aa3a7bf..d4b7a51d5 100644
--- a/e2e/calculator.po.ts
+++ b/e2e/calculator.po.ts
@@ -3,7 +3,7 @@ import { browser, by, element } from "protractor";
 export class CalculatorPage {
 
   getInputLabels() {
-    return element.all(by.css("ngparam-input label"));
+    return element.all(by.css("ngparam-input input:not([disabled]) label"));
   }
 
   getHeader1() {
diff --git a/e2e/navigate-through-calculators.e2e-spec.ts b/e2e/navigate-through-calculators.e2e-spec.ts
index 54e255dad..f2f91340e 100644
--- a/e2e/navigate-through-calculators.e2e-spec.ts
+++ b/e2e/navigate-through-calculators.e2e-spec.ts
@@ -14,7 +14,7 @@ describe("ngHyd − create calculators and navigate among them", () => {
     navbar = new Navbar();
   });
 
-  it("when many calculators are open, navigating among them should not fail (all labels should be visible)", async () => {
+  it("when many calculators are open, navigating among them should not fail (all active labels should be visible)", async () => {
     await listPage.navigateTo();
     // open 8 calculators
     for (let i = 0; i < 6; i++) {
-- 
GitLab