Skip to content
GitLab
Commit 546882d4 authored by Mathias Chouet's avatar Mathias Chouet :spaghetti:
Browse files

Update e2e organization

parent a83d1362
devel 591-macrorugo-mise-a-jour-de-la-formule-f-h-a-partir-de-cassan-2023 609-ajout-du-module-courbe-de-remous-d-une-passe-a-macro-rugosite 621-utiliser-des-identifiants-symboliques-plutot-que-numeriques-dans-les-fichiers 622-mise-a-jour-vers-angular-16 master 4.17.0 4.16.3 4.16.2 4.16.1 4.16.0 4.15.1 4.15.0 4.14.2 4.14.1 4.14.0 4.13.1 4.13.0 4.12.1 4.12.0 4.11.1 4.11.0 4.10.6 4.10.5 4.10.4 4.10.3 4.10.2 4.10.1 4.10.0 4.9.0 4.8.1 4.8.0 4.7.0 4.6.1 4.6.0 4.5.0 4.4.2 4.4.1 4.4.0 stable
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 543 deletions
+7 -543
e2e/compute-reset-chained-links.e2e-spec.ts
+ 2
− 2
View file @ 546882d4
......@@ -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);
......
e2e/load-linked-params.e2e-spec.ts
+ 1
− 1
View file @ 546882d4
......@@ -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);
......
e2e/load-save-session.e2e-spec.ts
+ 2
− 2
View file @ 546882d4
......@@ -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);
......
e2e/pab.e2e-spec.ts
+ 2
− 2
View file @ 546882d4
......@@ -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);
......
e2e/session-pab-mauvais-ordre.json deleted 100644 → 0
+ 0
− 452
View file @ a83d1362
{
"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
e2e/session-pab-modeles-vides.json deleted 100644 → 0
+ 0
− 84
View file @ a83d1362
{
"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
}
]
}
]
}
e2e/session-6-calc.test.json → e2e/sessions/session-6-calc.test.json
+ 0
− 0
View file @ 546882d4
File moved
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment