Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/app/main/measureManagerService.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions app/app/reports/reportsController.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions playwright/page-objects/modals/modal.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 2 additions & 1 deletion playwright/page-objects/pages/reports.po.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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));
}
}
Loading