Skip to content
Snippets Groups Projects
Commit e2756887 authored by Dorchies David's avatar Dorchies David
Browse files

Merge branch...

Merge branch '619-prebarrage-il-n-y-a-plus-aucun-resultat-au-niveau-des-cloisons-version-dev' into 'devel'

Resolve "PreBarrage: il n'y a plus aucun résultat au niveau des cloisons (version dev)"

Closes #619

See merge request !222
parents fce44230 6ccae3f9
No related branches found
No related tags found
2 merge requests!225Release v4.17.0,!222Resolve "PreBarrage: il n'y a plus aucun résultat au niveau des cloisons (version dev)"
Pipeline #140349 passed
......@@ -249,6 +249,8 @@ export class CalculatorPage {
||
await this.presentAndVisible("pb-results pb-results-table")
||
await this.presentAndVisible("pb-results pb-cloison-results")
||
await this.presentAndVisible("macrorugo-compound-results macrorugo-compound-results-table")
||
await this.presentAndVisible("jet-results .fixed-results-container")
......
import { ListPage } from "./list.po";
import { CalculatorPage } from "./calculator.po";
import { Navbar } from "./navbar.po";
import { browser, by, element } from "protractor";
import { AppPage } from "./app.po";
import { SideNav } from "./sidenav.po";
import { PreferencesPage } from "./preferences.po";
import { changeSelectValue, scrollPageToTop } from "./util.po";
/**
* Clone calculators
*/
describe("Prébarrages results - ", () => {
let listPage: ListPage;
let calcPage: CalculatorPage;
let navBar: Navbar;
let prefPage: PreferencesPage;
beforeAll(() => {
listPage = new ListPage();
calcPage = new CalculatorPage();
navBar = new Navbar();
prefPage = new PreferencesPage();
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 1000;
});
beforeEach(async () => {
// disable evil option "empty fields on module creation"
await prefPage.navigateTo();
await prefPage.disableEvilEmptyFields();
await browser.sleep(200);
});
it("every module shoud have results", async () => {
// create prébarrage calculator
await navBar.clickNewCalculatorButton();
await listPage.clickMenuEntryForCalcType(30);
// run calculation
const calcButton = calcPage.getCalculateButton();
await calcButton.click();
await browser.sleep(200);
const nodes = element.all(by.css("g.nodes > g"));
const nb = await nodes.count();
for (let n = 0; n < nb; n++) {
const node = nodes.get(n);
await node.click();
await browser.sleep(200);
// check that result is not empty
const hasResults = await calcPage.hasResults();
expect(hasResults).toBe(true);
}
});
});
......@@ -344,7 +344,7 @@ export abstract class FormulaireDefinition extends FormulaireNode implements Obs
}
}
this.completeParse();
this.completeParse(false);
}
public hasParameter(symbol: string): boolean {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment