diff --git a/e2e/calculator.po.ts b/e2e/calculator.po.ts
index 7fe9dfb7a0a373789920b7cfc7e7762d0f4e0405..ffe8a5f4eecd615aa1ea8460873a7955fdbc2909 100644
--- a/e2e/calculator.po.ts
+++ b/e2e/calculator.po.ts
@@ -217,9 +217,8 @@ export class CalculatorPage {
async changeSelectValue(elt: ElementFinder, index: number) {
await elt.click();
- const options = (await elt.getAttribute("aria-owns")).split(" ");
- const optId = options[index];
- const option = element(by.id(optId));
+ const optionId = ".cdk-overlay-container mat-option:nth-of-type(" + (index + 1) + ")";
+ const option = element(by.css(optionId));
await option.click();
}
diff --git a/e2e/load-linked-params.e2e-spec.ts b/e2e/load-linked-params.e2e-spec.ts
index 81a1651bddfeffac8d29b0327f37789413e7fb14..8e87b5f94762afde2a6fca298d6dd80ba5d00cef 100644
--- a/e2e/load-linked-params.e2e-spec.ts
+++ b/e2e/load-linked-params.e2e-spec.ts
@@ -4,6 +4,7 @@ import { CalculatorPage } from "./calculator.po";
import { Navbar } from "./navbar.po";
import { SideNav } from "./sidenav.po";
import { browser } from "protractor";
+import { PreferencesPage } from "./preferences.po";
/**
* Load a session containing 5 calculators, having multiple linked parameters
@@ -14,21 +15,29 @@ describe("ngHyd − load session with multiple linked parameters − ", () => {
let startPage: AppPage;
let listPage: ListPage;
let calcPage: CalculatorPage;
+ let prefPage: PreferencesPage;
let navbar: Navbar;
let sidenav: SideNav;
function init() {
startPage = new AppPage();
calcPage = new CalculatorPage();
+ prefPage = new PreferencesPage();
navbar = new Navbar();
sidenav = new SideNav();
listPage = new ListPage();
}
- beforeEach(init);
+ beforeAll(init);
- it("when loading session-liens-spaghetti.json, all links should point to the right target", async () => {
- await startPage.navigateTo();
+ beforeEach(async () => {
+ // force language to prevent issues due to default browser language
+ await prefPage.navigateTo();
+ await prefPage.changeLanguage(1); // fr
+ await browser.sleep(200);
+ await navbar.clickNewCalculatorButton();
+ });
+ it("when loading session-liens-spaghetti.json, all links should point to the right target", async () => {
await navbar.clickMenuButton();
await browser.sleep(200);
diff --git a/e2e/load-malformed-files.e2e-spec.ts b/e2e/load-malformed-files.e2e-spec.ts
index e022c902167b385d3fb38a8283d0712553e250ee..995d819e006531f6fb4d1fa44e84f69c647e27f9 100644
--- a/e2e/load-malformed-files.e2e-spec.ts
+++ b/e2e/load-malformed-files.e2e-spec.ts
@@ -2,6 +2,7 @@ import { AppPage } from "./app.po";
import { Navbar } from "./navbar.po";
import { SideNav } from "./sidenav.po";
import { browser, element, by } from "protractor";
+import { PreferencesPage } from "./preferences.po";
/**
* Load 4 malformed session files :
@@ -15,13 +16,23 @@ describe("ngHyd − load malformed session files − ", () => {
let startPage: AppPage;
let navbar: Navbar;
let sidenav: SideNav;
+ let prefPage: PreferencesPage;
function init() {
startPage = new AppPage();
navbar = new Navbar();
sidenav = new SideNav();
+ prefPage = new PreferencesPage();
}
- beforeEach(init);
+ beforeAll(init);
+
+ beforeEach(async () => {
+ // force language to prevent issues due to default browser language
+ await prefPage.navigateTo();
+ await prefPage.changeLanguage(1); // fr
+ await browser.sleep(200);
+ await navbar.clickNewCalculatorButton();
+ });
it("when loading session-bad-syntax.json, displayed error should be relevant", async () => {
await startPage.navigateTo();
diff --git a/e2e/navbar.po.ts b/e2e/navbar.po.ts
index 739d5bd0a2a2b67fc130de13ccf0a03fa75a0011..2c498a4bd9d4adcfb97f7d8283d750f5c59a843f 100644
--- a/e2e/navbar.po.ts
+++ b/e2e/navbar.po.ts
@@ -14,9 +14,9 @@ export class Navbar {
const dropDown = element(by.css("mat-select#selectCalculator"));
if (await dropDown.isPresent() && await dropDown.isDisplayed()) {
await dropDown.click();
- const options = (await dropDown.getAttribute("aria-owns")).split(" ");
+ const options = element.all(by.css(".cdk-overlay-container mat-option"));
await dropDown.sendKeys(protractor.Key.ESCAPE); // close dropdown
- return options.length;
+ return await options.count();
} else {
return (await element.all(by.css("#tabs-container button.calculator-button"))).length;
}
@@ -31,9 +31,8 @@ export class Navbar {
const dropDown = element(by.css("mat-select#selectCalculator"));
if (await dropDown.isPresent() && await dropDown.isDisplayed()) {
await dropDown.click();
- const options = (await dropDown.getAttribute("aria-owns")).split(" ");
- const optId = options[n];
- const option = element(by.id(optId));
+ const optionId = ".cdk-overlay-container mat-option#mat-option-" + n;
+ const option = element(by.css(optionId));
await option.click();
} else {
const tabs = this.getAllCalculatorTabs();
diff --git a/e2e/preferences.po.ts b/e2e/preferences.po.ts
index 038b2d18db14d7a6e7d150eb6e96ce157b4b6933..016d2da96c91a27e730c757f5382e60db283b088 100644
--- a/e2e/preferences.po.ts
+++ b/e2e/preferences.po.ts
@@ -36,9 +36,8 @@ export class PreferencesPage {
async changeLanguage(index: number) {
const select = this.getLanguageSelect();
await select.click();
- const options = (await select.getAttribute("aria-owns")).split(" ");
- const optId = options[index];
- const option = element(by.id(optId));
+ const optionId = ".cdk-overlay-container mat-option#mat-option-" + index;
+ const option = element(by.css(optionId));
await option.click();
}
diff --git a/e2e/solveur.e2e-spec.ts b/e2e/solveur.e2e-spec.ts
index 334625f501e347474787d77ba72211a20224fa7c..a8d0123180ec44898a2545e7b76a24dbdc329731 100644
--- a/e2e/solveur.e2e-spec.ts
+++ b/e2e/solveur.e2e-spec.ts
@@ -17,22 +17,27 @@ describe("Solveur - ", () => {
let sidenav: SideNav;
let prefPage: PreferencesPage;
- beforeEach(async () => {
+ beforeAll(async () => {
startPage = new AppPage();
prefPage = new PreferencesPage();
listPage = new ListPage();
calcPage = new CalculatorPage();
navbar = new Navbar();
sidenav = new SideNav();
- // disable evil option "empty fields on module creation"
+ });
+
+ beforeEach(async () => {
await prefPage.navigateTo();
+ // disable evil option "empty fields on module creation"
await prefPage.disableEvilEmptyFields();
await browser.sleep(200);
+ // force language to prevent issues due to default browser language
+ await prefPage.changeLanguage(1); // fr
+ await browser.sleep(200);
+ await navbar.clickNewCalculatorButton();
});
it("load > calculate", async () => {
- await navbar.clickNewCalculatorButton();
-
await navbar.clickMenuButton();
await browser.sleep(200);
@@ -78,8 +83,6 @@ describe("Solveur - ", () => {
});
it("create > feed > calculate > clone > calculate clone", async () => {
- await navbar.clickNewCalculatorButton();
-
// 1. create empty Solveur
await listPage.clickMenuEntryForCalcType(22); // Solveur
await browser.sleep(500);
diff --git a/protractor.conf.js b/protractor.conf.js
index f11305504967693ff541e18f9b137875670f7e2d..d474c230b2a8c1592f135dd650a605a8af92ec03 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -37,8 +37,7 @@ exports.config = {
args: [
"--no-sandbox",
"--headless",
- "--window-size=1024x768",
- "lang=fr-FR"
+ "--window-size=1024x768"
],
prefs: {
download: {