Skip to content
Snippets Groups Projects
Commit 3fd7b176 authored by mathias.chouet's avatar mathias.chouet
Browse files

Update e2e organization

parent d56768dd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 543 deletions
e2e/compute-reset-chained-links.e2e-spec.ts
+ 2
− 2
View file @ 3fd7b176
...@@ -32,7 +32,7 @@ describe("ngHyd − compute then reset chained results", () => { ...@@ -32,7 +32,7 @@ describe("ngHyd − compute then reset chained results", () => {
await browser.sleep(200); await browser.sleep(200);
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); await browser.sleep(200);
await sidenav.loadSessionFile("./session-cascade-params.json"); await sidenav.loadSessionFile("./session/session-cascade-params.json");
await browser.sleep(500); await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(3); expect(await navbar.getAllCalculatorTabs().count()).toBe(3);
...@@ -78,7 +78,7 @@ describe("ngHyd − compute then reset chained results", () => { ...@@ -78,7 +78,7 @@ describe("ngHyd − compute then reset chained results", () => {
await browser.sleep(200); await browser.sleep(200);
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); await browser.sleep(200);
await sidenav.loadSessionFile("./session-cascade-results.json"); await sidenav.loadSessionFile("./session/session-cascade-results.json");
await browser.sleep(500); await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(3); expect(await navbar.getAllCalculatorTabs().count()).toBe(3);
......
e2e/load-linked-params.e2e-spec.ts
+ 1
− 1
View file @ 3fd7b176
...@@ -35,7 +35,7 @@ describe("ngHyd − load session with multiple linked parameters − ", () => { ...@@ -35,7 +35,7 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); await browser.sleep(200);
await sidenav.loadSessionFile("./session-liens-spaghetti.json"); await sidenav.loadSessionFile("./session/session-liens-spaghetti.json");
await browser.sleep(500); await browser.sleep(500);
expect(await navbar.getAllCalculatorTabs().count()).toBe(5); expect(await navbar.getAllCalculatorTabs().count()).toBe(5);
......
e2e/load-save-session.e2e-spec.ts
+ 2
− 2
View file @ 3fd7b176
...@@ -32,7 +32,7 @@ describe("ngHyd − save and load sessions", () => { ...@@ -32,7 +32,7 @@ describe("ngHyd − save and load sessions", () => {
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); 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); await browser.sleep(200);
expect(await navbar.getAllCalculatorTabs().count()).toBe(6); expect(await navbar.getAllCalculatorTabs().count()).toBe(6);
...@@ -47,7 +47,7 @@ describe("ngHyd − save and load sessions", () => { ...@@ -47,7 +47,7 @@ describe("ngHyd − save and load sessions", () => {
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); 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); await browser.sleep(200);
expect(await navbar.getAllCalculatorTabs().count()).toBe(1); expect(await navbar.getAllCalculatorTabs().count()).toBe(1);
......
e2e/pab.e2e-spec.ts
+ 2
− 2
View file @ 3fd7b176
...@@ -109,7 +109,7 @@ describe("ngHyd − Passe à Bassins", () => { ...@@ -109,7 +109,7 @@ describe("ngHyd − Passe à Bassins", () => {
await browser.sleep(200); await browser.sleep(200);
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); await browser.sleep(200);
await sidenav.loadSessionFile("./session-pab.json"); await sidenav.loadSessionFile("./session/session-pab.json");
await browser.sleep(500); await browser.sleep(500);
// check existence of the loaded modules // check existence of the loaded modules
expect(await navbar.getAllCalculatorTabs().count()).toBe(6); expect(await navbar.getAllCalculatorTabs().count()).toBe(6);
...@@ -150,7 +150,7 @@ describe("ngHyd − Passe à Bassins", () => { ...@@ -150,7 +150,7 @@ describe("ngHyd − Passe à Bassins", () => {
await browser.sleep(200); await browser.sleep(200);
await sidenav.clickLoadSessionButton(); await sidenav.clickLoadSessionButton();
await browser.sleep(200); await browser.sleep(200);
await sidenav.loadSessionFile("./pab-regulee-variee.json"); await sidenav.loadSessionFile("./session/session-pab-regulee-variee.json");
await browser.sleep(500); await browser.sleep(500);
// check existence of the loaded module // check existence of the loaded module
expect(await navbar.getAllCalculatorTabs().count()).toBe(1); expect(await navbar.getAllCalculatorTabs().count()).toBe(1);
......
e2e/session-pab-mauvais-ordre.json deleted 100644 → 0
+ 0
− 452
View file @ d56768dd
{
"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 @ d56768dd
{
"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
}
]
}
]
}
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