diff --git a/e2e/macrorugo-remous.e2e-spec.ts b/e2e/macrorugo-remous.e2e-spec.ts index 73bd059da654122483ac8931502c830362529ee3..b8cde6b551eb4f1aeaa1bda08d615a8ebae7ac29 100644 --- a/e2e/macrorugo-remous.e2e-spec.ts +++ b/e2e/macrorugo-remous.e2e-spec.ts @@ -2,16 +2,19 @@ import { ListPage } from "./list.po"; import { browser, by, element } from "protractor"; import { PreferencesPage } from "./preferences.po"; import { Navbar } from "./navbar.po"; +import { CalculatorPage } from "./calculator.po"; describe("MacroRugoRemous - ", () => { let prefPage: PreferencesPage; let listPage: ListPage; let navBar: Navbar; + let calcPage: CalculatorPage; beforeAll(() => { prefPage = new PreferencesPage(); listPage = new ListPage(); navBar = new Navbar(); + calcPage = new CalculatorPage(); // browser.manage().window().setPosition(2000, 30); }); @@ -55,4 +58,49 @@ describe("MacroRugoRemous - ", () => { const emptyMsg = element(by.css("div .message-when-empty")); expect(await emptyMsg.isPresent()).toBe(false); }); + + it("check select error message when target PAM has no variated parameter", async () => { + // start page + await navBar.clickNewCalculatorButton(); + await browser.sleep(200); + + // PAM calculator + await listPage.clickMenuEntryForCalcType(11); + browser.sleep(200); + + // MacroRugoRemous calculator + await navBar.clickNewCalculatorButton(); + await browser.sleep(200); + + await listPage.clickMenuEntryForCalcType(37); + browser.sleep(200); + + const errorMsg = element(by.css("div .select-error-message")); + expect(await errorMsg.isPresent()).toBe(false); + }); + + it("check select error message when target PAM has a variated parameter", async () => { + // start page + await navBar.clickNewCalculatorButton(); + await browser.sleep(200); + + // PAM calculator + await listPage.clickMenuEntryForCalcType(11); + browser.sleep(200); + + // set ZF1 to variated mode + const zf1 = calcPage.getInputById("ZF1"); + await calcPage.setParamMode(zf1, "var"); + await browser.sleep(200); + + // MacroRugoRemous calculator + await navBar.clickNewCalculatorButton(); + await browser.sleep(200); + + await listPage.clickMenuEntryForCalcType(37); + browser.sleep(200); + + const errorMsg = element(by.css("div .select-error-message")); + expect(await errorMsg.isPresent()).toBe(true); + }); }); diff --git a/src/app/components/generic-select/generic-select.component.html b/src/app/components/generic-select/generic-select.component.html index 68c4dfa09741cfb21e6b22ab2cfb938a7f00ed7d..fb5eea0b5b684ed6358f17b333df0218fc016136 100644 --- a/src/app/components/generic-select/generic-select.component.html +++ b/src/app/components/generic-select/generic-select.component.html @@ -23,6 +23,6 @@ <div *ngIf="messageWhenEmpty" class="message-when-empty"> {{ messageWhenEmpty }} </div> -<div *ngIf="errorMessage" class="message-when-empty"> +<div *ngIf="errorMessage" class="select-error-message"> {{ errorMessage }} </div> diff --git a/src/app/components/select-field-line/select-field-line.component.scss b/src/app/components/select-field-line/select-field-line.component.scss index 92327696435c625fdda147240428e1e5ede6d298..737b701b1943c098eda72782b74ca08f1f4fdd81 100644 --- a/src/app/components/select-field-line/select-field-line.component.scss +++ b/src/app/components/select-field-line/select-field-line.component.scss @@ -18,3 +18,8 @@ mat-form-field { color: #af1280; // like mat-error font-weight: 500; } + +.select-error-message { + color: #af1280; // like mat-error + font-weight: 500; +}