From 546882d4ecbc1c858f91f4b0910bc43f69cb1063 Mon Sep 17 00:00:00 2001
From: "mathias.chouet" <mathias.chouet@irstea.fr>
Date: Fri, 12 Jul 2019 10:06:19 +0200
Subject: [PATCH] Update e2e organization
---
e2e/compute-reset-chained-links.e2e-spec.ts | 4 +-
e2e/load-linked-params.e2e-spec.ts | 2 +-
e2e/load-save-session.e2e-spec.ts | 4 +-
e2e/pab.e2e-spec.ts | 4 +-
e2e/session-pab-mauvais-ordre.json | 452 ------------------
e2e/session-pab-modeles-vides.json | 84 ----
e2e/{ => sessions}/session-6-calc.test.json | 0
.../session-cascade-params.json | 0
.../session-cascade-results.json | 0
.../session-liens-spaghetti.json | 0
.../session-optional-params.test.json | 0
.../session-pab-regulee-variee.json} | 0
12 files changed, 7 insertions(+), 543 deletions(-)
delete mode 100644 e2e/session-pab-mauvais-ordre.json
delete mode 100644 e2e/session-pab-modeles-vides.json
rename e2e/{ => sessions}/session-6-calc.test.json (100%)
rename e2e/{ => sessions}/session-cascade-params.json (100%)
rename e2e/{ => sessions}/session-cascade-results.json (100%)
rename e2e/{ => sessions}/session-liens-spaghetti.json (100%)
rename e2e/{ => sessions}/session-optional-params.test.json (100%)
rename e2e/{pab-regulee-variee.json => sessions/session-pab-regulee-variee.json} (100%)
diff --git a/e2e/compute-reset-chained-links.e2e-spec.ts b/e2e/compute-reset-chained-links.e2e-spec.ts
index ac4274519..0ec8e5dfc 100644
--- a/e2e/compute-reset-chained-links.e2e-spec.ts
+++ b/e2e/compute-reset-chained-links.e2e-spec.ts
@@ -32,7 +32,7 @@ describe("ngHyd − compute then reset chained results", () => {
await browser.sleep(200);
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./session-cascade-params.json");
+ await sidenav.loadSessionFile("./session/session-cascade-params.json");
await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(3);
@@ -78,7 +78,7 @@ describe("ngHyd − compute then reset chained results", () => {
await browser.sleep(200);
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./session-cascade-results.json");
+ await sidenav.loadSessionFile("./session/session-cascade-results.json");
await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(3);
diff --git a/e2e/load-linked-params.e2e-spec.ts b/e2e/load-linked-params.e2e-spec.ts
index 99f13e11f..a26bb90c8 100644
--- a/e2e/load-linked-params.e2e-spec.ts
+++ b/e2e/load-linked-params.e2e-spec.ts
@@ -35,7 +35,7 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./session-liens-spaghetti.json");
+ await sidenav.loadSessionFile("./session/session-liens-spaghetti.json");
await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(5);
diff --git a/e2e/load-save-session.e2e-spec.ts b/e2e/load-save-session.e2e-spec.ts
index d18d7732b..4badbd456 100644
--- a/e2e/load-save-session.e2e-spec.ts
+++ b/e2e/load-save-session.e2e-spec.ts
@@ -32,7 +32,7 @@ describe("ngHyd − save and load sessions", () => {
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./session-6-calc.test.json");
+ await sidenav.loadSessionFile("./session/session-6-calc.test.json");
await browser.sleep(200);
expect(await navbar.getAllCalculatorTabs().count()).toBe(6);
@@ -47,7 +47,7 @@ describe("ngHyd − save and load sessions", () => {
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./session-optional-params.test.json");
+ await sidenav.loadSessionFile("./session/session-optional-params.test.json");
await browser.sleep(200);
expect(await navbar.getAllCalculatorTabs().count()).toBe(1);
diff --git a/e2e/pab.e2e-spec.ts b/e2e/pab.e2e-spec.ts
index 6fd20d5c8..6d6ad1a5b 100644
--- a/e2e/pab.e2e-spec.ts
+++ b/e2e/pab.e2e-spec.ts
@@ -109,7 +109,7 @@ describe("ngHyd − Passe à Bassins", () => {
await browser.sleep(200);
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./session-pab.json");
+ await sidenav.loadSessionFile("./session/session-pab.json");
await browser.sleep(500);
// check existence of the loaded modules
expect(await navbar.getAllCalculatorTabs().count()).toBe(6);
@@ -150,7 +150,7 @@ describe("ngHyd − Passe à Bassins", () => {
await browser.sleep(200);
await sidenav.clickLoadSessionButton();
await browser.sleep(200);
- await sidenav.loadSessionFile("./pab-regulee-variee.json");
+ await sidenav.loadSessionFile("./session/session-pab-regulee-variee.json");
await browser.sleep(500);
// check existence of the loaded module
expect(await navbar.getAllCalculatorTabs().count()).toBe(1);
diff --git a/e2e/session-pab-mauvais-ordre.json b/e2e/session-pab-mauvais-ordre.json
deleted file mode 100644
index 998442a72..000000000
--- a/e2e/session-pab-mauvais-ordre.json
+++ /dev/null
@@ -1,452 +0,0 @@
-{
- "header": {
- "source": "jalhyd",
- "format_version": "1.0",
- "created": "2019-05-10T13:09:33.792Z"
- },
- "session": [
- {
- "uid": "NXd0dH",
- "props": {
- "calcType": 15,
- "nodeType": 0
- },
- "meta": {
- "title": "PAB"
- },
- "children": [
- {
- "uid": "bWswdD",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 2
- }
- ]
- },
- {
- "uid": "am1oNz",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 1
- }
- ]
- },
- {
- "uid": "cWJrZm",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 3
- }
- ]
- },
- {
- "uid": "Y25nNn",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 5
- }
- ]
- },
- {
- "uid": "M2gxaX",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 4
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "SINGLE",
- "value": "1.533"
- },
- {
- "symbol": "Z1",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z2",
- "mode": "SINGLE",
- "value": 99.44
- }
- ]
- },
- {
- "uid": "amp6N2",
- "props": {
- "calcType": 10,
- "nodeType": 0
- },
- "meta": {
- "title": "Cloisons"
- },
- "children": [
- {
- "uid": "YzNjam",
- "props": {
- "calcType": 7,
- "nodeType": 5,
- "structureType": 2,
- "loiDebit": 12
- },
- "children": [],
- "parameters": [
- {
- "symbol": "S",
- "mode": "SINGLE",
- "value": 0.1
- },
- {
- "symbol": "Cd",
- "mode": "SINGLE",
- "value": 0.7
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z1",
- "mode": "SINGLE",
- "value": 102
- },
- {
- "symbol": "LB",
- "mode": "SINGLE",
- "value": 10
- },
- {
- "symbol": "BB",
- "mode": "SINGLE",
- "value": 1
- },
- {
- "symbol": "PB",
- "mode": "SINGLE",
- "value": 1
- },
- {
- "symbol": "DH",
- "mode": "SINGLE",
- "value": 0.5
- }
- ]
- },
- {
- "uid": "bTkxem",
- "props": {
- "calcType": 10,
- "nodeType": 0
- },
- "meta": {
- "title": "Cloisons 2"
- },
- "children": [
- {
- "uid": "Y3JjaW",
- "props": {
- "calcType": 7,
- "nodeType": 5,
- "structureType": 2,
- "loiDebit": 12
- },
- "children": [],
- "parameters": [
- {
- "symbol": "S",
- "mode": "SINGLE",
- "value": 0.1
- },
- {
- "symbol": "Cd",
- "mode": "SINGLE",
- "value": 0.7
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z1",
- "mode": "SINGLE",
- "value": 102
- },
- {
- "symbol": "LB",
- "mode": "SINGLE",
- "value": 10
- },
- {
- "symbol": "BB",
- "mode": "SINGLE",
- "value": 1
- },
- {
- "symbol": "PB",
- "mode": "SINGLE",
- "value": 1
- },
- {
- "symbol": "DH",
- "mode": "SINGLE",
- "value": 0.5
- }
- ]
- },
- {
- "uid": "bnNhen",
- "props": {
- "calcType": 10,
- "nodeType": 0
- },
- "meta": {
- "title": "Cloisons 1"
- },
- "children": [
- {
- "uid": "amJzem",
- "props": {
- "calcType": 7,
- "nodeType": 5,
- "structureType": 2,
- "loiDebit": 12
- },
- "children": [],
- "parameters": [
- {
- "symbol": "S",
- "mode": "SINGLE",
- "value": 0.1
- },
- {
- "symbol": "Cd",
- "mode": "SINGLE",
- "value": 0.7
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z1",
- "mode": "SINGLE",
- "value": 102
- },
- {
- "symbol": "LB",
- "mode": "SINGLE",
- "value": 10
- },
- {
- "symbol": "BB",
- "mode": "SINGLE",
- "value": 1
- },
- {
- "symbol": "PB",
- "mode": "SINGLE",
- "value": 1
- },
- {
- "symbol": "DH",
- "mode": "SINGLE",
- "value": 0.5
- }
- ]
- },
- {
- "uid": "M2Q0NX",
- "props": {
- "calcType": 8,
- "nodeType": 0
- },
- "meta": {
- "title": "Ouvrages"
- },
- "children": [
- {
- "uid": "MmJxen",
- "props": {
- "calcType": 7,
- "nodeType": 5,
- "structureType": 1,
- "loiDebit": 1
- },
- "children": [],
- "parameters": [
- {
- "symbol": "ZDV",
- "mode": "SINGLE",
- "value": 100
- },
- {
- "symbol": "W",
- "mode": "SINGLE",
- "value": 0.5
- },
- {
- "symbol": "L",
- "mode": "SINGLE",
- "value": 2
- },
- {
- "symbol": "Cd",
- "mode": "SINGLE",
- "value": 0.4
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z1",
- "mode": "SINGLE",
- "value": 102
- },
- {
- "symbol": "Z2",
- "mode": "SINGLE",
- "value": 101.5
- }
- ]
- },
- {
- "uid": "eWtnaj",
- "props": {
- "calcType": 8,
- "nodeType": 0
- },
- "meta": {
- "title": "Ouvrages 1"
- },
- "children": [
- {
- "uid": "ZmhpeG",
- "props": {
- "calcType": 7,
- "nodeType": 5,
- "structureType": 1,
- "loiDebit": 1
- },
- "children": [],
- "parameters": [
- {
- "symbol": "ZDV",
- "mode": "SINGLE",
- "value": 100
- },
- {
- "symbol": "W",
- "mode": "SINGLE",
- "value": 0.5
- },
- {
- "symbol": "L",
- "mode": "SINGLE",
- "value": 2
- },
- {
- "symbol": "Cd",
- "mode": "SINGLE",
- "value": 0.4
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z1",
- "mode": "SINGLE",
- "value": 102
- },
- {
- "symbol": "Z2",
- "mode": "SINGLE",
- "value": 101.5
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/e2e/session-pab-modeles-vides.json b/e2e/session-pab-modeles-vides.json
deleted file mode 100644
index b67b85a2e..000000000
--- a/e2e/session-pab-modeles-vides.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "header": {
- "source": "jalhyd",
- "format_version": "1.0",
- "created": "2019-05-09T09:57:38.480Z"
- },
- "session": [
- {
- "uid": "b2xqMj",
- "props": {
- "calcType": 15,
- "nodeType": 0
- },
- "meta": {
- "title": "PAB"
- },
- "children": [
- {
- "uid": "czlkYn",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 0
- }
- ]
- },
- {
- "uid": "eTlyYT",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 0
- }
- ]
- },
- {
- "uid": "d3Q3an",
- "props": {
- "calcType": 16,
- "nodeType": 0
- },
- "parameters": [
- {
- "symbol": "QA",
- "mode": "SINGLE",
- "value": 0
- }
- ]
- }
- ],
- "parameters": [
- {
- "symbol": "Pr",
- "mode": "SINGLE",
- "value": 0.0001
- },
- {
- "symbol": "Q",
- "mode": "SINGLE",
- "value": 1.5
- },
- {
- "symbol": "Z1",
- "mode": "CALCUL"
- },
- {
- "symbol": "Z2",
- "mode": "SINGLE",
- "value": 99
- }
- ]
- }
- ]
-}
diff --git a/e2e/session-6-calc.test.json b/e2e/sessions/session-6-calc.test.json
similarity index 100%
rename from e2e/session-6-calc.test.json
rename to e2e/sessions/session-6-calc.test.json
diff --git a/e2e/session-cascade-params.json b/e2e/sessions/session-cascade-params.json
similarity index 100%
rename from e2e/session-cascade-params.json
rename to e2e/sessions/session-cascade-params.json
diff --git a/e2e/session-cascade-results.json b/e2e/sessions/session-cascade-results.json
similarity index 100%
rename from e2e/session-cascade-results.json
rename to e2e/sessions/session-cascade-results.json
diff --git a/e2e/session-liens-spaghetti.json b/e2e/sessions/session-liens-spaghetti.json
similarity index 100%
rename from e2e/session-liens-spaghetti.json
rename to e2e/sessions/session-liens-spaghetti.json
diff --git a/e2e/session-optional-params.test.json b/e2e/sessions/session-optional-params.test.json
similarity index 100%
rename from e2e/session-optional-params.test.json
rename to e2e/sessions/session-optional-params.test.json
diff --git a/e2e/pab-regulee-variee.json b/e2e/sessions/session-pab-regulee-variee.json
similarity index 100%
rename from e2e/pab-regulee-variee.json
rename to e2e/sessions/session-pab-regulee-variee.json
--
GitLab