From 8918bcc86c6483c22a03d78637b357a0b63f2022 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Thu, 12 Sep 2019 11:54:55 +0200
Subject: [PATCH] Updated e2e to get rid of "Pr"
---
e2e/pab.e2e-spec.ts | 9 +----
e2e/session/session-6-calc.test.json | 40 -------------------
e2e/session/session-cascade-params.json | 30 --------------
e2e/session/session-cascade-results.json | 15 -------
e2e/session/session-liens-spaghetti.json | 35 ----------------
e2e/session/session-multivar-link.json | 10 -----
e2e/session/session-optional-params.test.json | 10 -----
e2e/session/session-results-invalidation.json | 10 -----
8 files changed, 1 insertion(+), 158 deletions(-)
diff --git a/e2e/pab.e2e-spec.ts b/e2e/pab.e2e-spec.ts
index 6d87488c5..2ce10079a 100644
--- a/e2e/pab.e2e-spec.ts
+++ b/e2e/pab.e2e-spec.ts
@@ -123,7 +123,6 @@ describe("ngHyd − Passe à Bassins", () => {
await nbBassins.sendKeys("9");
// click "Generate"
- await browser.sleep(10000);
await element(by.css("dialog-generate-pab button#do-generate")).click();
await browser.sleep(1000);
@@ -133,9 +132,6 @@ describe("ngHyd − Passe à Bassins", () => {
// check that result is not empty
const hasResults = await calcPage.hasResults();
expect(hasResults).toBe(true);
-
- // check absence of logs
- expect(await calcPage.nbLogEntries()).toBe(0);
});
});
@@ -209,9 +205,6 @@ describe("ngHyd − Passe à Bassins", () => {
// check that result is not empty
const hasResults = await calcPage.hasResults();
expect(hasResults).toBe(true);
-
- // check absence of logs
- expect(await calcPage.nbLogEntries()).toBe(0);
});
});
@@ -285,7 +278,7 @@ describe("ngHyd − Passe à Bassins", () => {
calcPage.changeSelectValue(pve, 3);
await browser.sleep(300);
// check absence of logs
- expect(await calcPage.nbLogEntries()).toBe(1);
+ expect(await calcPage.nbLogEntries()).toBe(2);
});
});
diff --git a/e2e/session/session-6-calc.test.json b/e2e/session/session-6-calc.test.json
index 888a2a2ed..b79ae1a94 100644
--- a/e2e/session/session-6-calc.test.json
+++ b/e2e/session/session-6-calc.test.json
@@ -11,11 +11,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "L",
"mode": "SINGLE",
@@ -48,11 +43,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "ZF1",
"mode": "SINGLE",
@@ -148,11 +138,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "CALCUL"
@@ -187,11 +172,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -226,11 +206,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
},
{
@@ -253,11 +228,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -292,11 +262,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Yamont",
"mode": "SINGLE",
@@ -330,11 +295,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "SINGLE",
diff --git a/e2e/session/session-cascade-params.json b/e2e/session/session-cascade-params.json
index c2ac90444..a17049558 100644
--- a/e2e/session/session-cascade-params.json
+++ b/e2e/session/session-cascade-params.json
@@ -18,11 +18,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -57,11 +52,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
},
{
@@ -82,11 +72,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -121,11 +106,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
},
{
@@ -146,11 +126,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -186,11 +161,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
}
]
diff --git a/e2e/session/session-cascade-results.json b/e2e/session/session-cascade-results.json
index 33d5a63e6..eebf487fc 100644
--- a/e2e/session/session-cascade-results.json
+++ b/e2e/session/session-cascade-results.json
@@ -16,11 +16,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "ZF1",
"mode": "SINGLE",
@@ -88,11 +83,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "L",
"mode": "LINK",
@@ -126,11 +116,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "LINK",
diff --git a/e2e/session/session-liens-spaghetti.json b/e2e/session/session-liens-spaghetti.json
index 5e6b53853..d33e60fd5 100644
--- a/e2e/session/session-liens-spaghetti.json
+++ b/e2e/session/session-liens-spaghetti.json
@@ -23,11 +23,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -63,11 +58,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
},
{
@@ -81,11 +71,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "ZF1",
"mode": "LINK",
@@ -235,11 +220,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "SINGLE",
@@ -276,11 +256,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -317,11 +292,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
},
{
@@ -358,11 +328,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "CALCUL"
diff --git a/e2e/session/session-multivar-link.json b/e2e/session/session-multivar-link.json
index b98c5c506..a1b7d0df8 100644
--- a/e2e/session/session-multivar-link.json
+++ b/e2e/session/session-multivar-link.json
@@ -40,11 +40,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "LINK",
@@ -113,11 +108,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "MINMAX",
diff --git a/e2e/session/session-optional-params.test.json b/e2e/session/session-optional-params.test.json
index 19bafb16d..7f4df3fcf 100644
--- a/e2e/session/session-optional-params.test.json
+++ b/e2e/session/session-optional-params.test.json
@@ -18,11 +18,6 @@
},
"children": [],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Ks",
"mode": "SINGLE",
@@ -62,11 +57,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- }
]
}
]
diff --git a/e2e/session/session-results-invalidation.json b/e2e/session/session-results-invalidation.json
index b98c5c506..a1b7d0df8 100644
--- a/e2e/session/session-results-invalidation.json
+++ b/e2e/session/session-results-invalidation.json
@@ -40,11 +40,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "LINK",
@@ -113,11 +108,6 @@
}
],
"parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
{
"symbol": "Q",
"mode": "MINMAX",
--
GitLab