diff --git a/app/app/main/measureManagerService.js b/app/app/main/measureManagerService.js index 184b9317..63ded4d7 100644 --- a/app/app/main/measureManagerService.js +++ b/app/app/main/measureManagerService.js @@ -284,7 +284,7 @@ export class MeasureManager { // Classic (Ruby) CLI uses to return a single-element list // C++ CLI returns the element directly //return res.data[0]; - return res.data + return res.data; }) .catch(res => { vm.$log.error('Measure Manager download_bcl_measure Error: ', res.data); diff --git a/app/app/reports/reportsController.js b/app/app/reports/reportsController.js index 5331a3f7..68c7a78c 100644 --- a/app/app/reports/reportsController.js +++ b/app/app/reports/reportsController.js @@ -121,7 +121,7 @@ export class ReportsController { // pass data into webview when dom is ready angular.element(document).ready(() => { vm.passData(); - }) + }); }; // Uncomment this to view webview developer tools to debug project reports @@ -132,7 +132,7 @@ export class ReportsController { // pass data into webview when dom is ready angular.element(document).ready(() => { vm.passData(); - }) + }); } // Opens the developer tools for the webview diff --git a/playwright/page-objects/modals/modal.po.ts b/playwright/page-objects/modals/modal.po.ts index d32f13b8..629ca8d2 100644 --- a/playwright/page-objects/modals/modal.po.ts +++ b/playwright/page-objects/modals/modal.po.ts @@ -30,6 +30,9 @@ export class ModalPO extends BasePageObject { } static async isTitleOk() { + // wait for the .modal-title locator to become visible + await this.title.waitFor({ state: 'visible' }); + // then assert its text await expect(this.title).toHaveText(this.EXPECTED_TITLE); } diff --git a/playwright/page-objects/pages/reports.po.ts b/playwright/page-objects/pages/reports.po.ts index 8fba9c94..0df914a4 100644 --- a/playwright/page-objects/pages/reports.po.ts +++ b/playwright/page-objects/pages/reports.po.ts @@ -1,3 +1,4 @@ +import path from 'path'; import { expect, Locator } from '@playwright/test'; import { EXPECTED_REPORT_VIEWS, Page, ReportView } from '../../constants'; import { PagePO } from './page.po'; @@ -34,6 +35,6 @@ export class ReportsPO extends PagePO { const expectedSrc = `${this.EXPECTED_SRC_FOLDER}${expectedSelectedView}.html`; const wvSrc = (await this.webview.getAttribute('src'))?.slice(-1 * expectedSrc.length); - expect(wvSrc).toBe(expectedSrc); + expect(path.normalize(wvSrc)).toBe(path.normalize(expectedSrc)); } }