diff --git a/e2e/suites/extensions/ext-info-drawer.test.ts b/e2e/suites/extensions/ext-info-drawer.test.ts index 5e5a2b336..16d8bd2a8 100755 --- a/e2e/suites/extensions/ext-info-drawer.test.ts +++ b/e2e/suites/extensions/ext-info-drawer.test.ts @@ -89,7 +89,7 @@ describe('Extensions - Info Drawer', () => { done(); }); - it('[C284646] Add a new tab with icon and title', async () => { + it('[C284646] Add a new tab with icon and title ', async () => { await page.dataTable.selectItem(file); await BrowserActions.click(page.toolbar.viewDetailsButton); await infoDrawer.waitForInfoDrawerToOpen(); diff --git a/e2e/suites/extensions/ext-viewer.test.ts b/e2e/suites/extensions/ext-viewer.test.ts index 28677dfee..aedcd0993 100755 --- a/e2e/suites/extensions/ext-viewer.test.ts +++ b/e2e/suites/extensions/ext-viewer.test.ts @@ -121,7 +121,7 @@ describe('Extensions - Viewer', () => { expect(await viewer.isViewerOpened()).toBe(true, 'Viewer is not opened'); expect(await toolbar.isButtonPresent(customAction.title)).toBe(true, 'Custom action is not present'); - expect(await toolbar.getButtonByTitleAttribute(customAction.title).getAttribute('id')).toEqual(customAction.id); + expect(await BrowserActions.getAttribute(toolbar.getButtonByTitleAttribute(customAction.title), 'id')).toEqual(customAction.id); expect(await toolbar.getButtonByTitleAttribute(customAction.title).getText()).toEqual(customAction.icon); }); @@ -129,7 +129,7 @@ describe('Extensions - Viewer', () => { await page.dataTable.doubleClickOnRowByName(pdfFile.file_name); expect(await viewer.isViewerOpened()).toBe(true, 'Viewer is not opened'); - expect(await toolbar.getButtonById(downloadButton.id).getAttribute('title')).toEqual(downloadButton.title); + expect(await BrowserActions.getAttribute(toolbar.getButtonById(downloadButton.id), 'title')).toEqual(downloadButton.title); }); it('[C286419] Remove action from toolbar', async () => { @@ -156,7 +156,7 @@ describe('Extensions - Viewer', () => { expect(await viewer.isViewerOpened()).toBe(true, 'Viewer is not opened'); await toolbar.openMoreMenu(); - expect(await toolbar.menu.getItemById(moveAction.id).getAttribute('title')).toEqual(moveAction.title); + expect(await BrowserActions.getAttribute(toolbar.menu.getItemById(moveAction.id), 'title')).toEqual(moveAction.title); }); it('[C286423] Remove action from More actions menu', async () => { diff --git a/e2e/suites/navigation/breadcrumb.test.ts b/e2e/suites/navigation/breadcrumb.test.ts index 7008fec98..a2578bc44 100755 --- a/e2e/suites/navigation/breadcrumb.test.ts +++ b/e2e/suites/navigation/breadcrumb.test.ts @@ -26,6 +26,7 @@ import { browser } from 'protractor'; import { AdminActions, SITE_VISIBILITY, LoginPage, BrowsingPage, Utils, RepoClient } from '@alfresco/aca-testing-shared'; +import { BrowserActions } from '@alfresco/adf-testing'; describe('Breadcrumb', () => { const username = `user-${Utils.random()}`; @@ -164,7 +165,7 @@ describe('Breadcrumb', () => { await page.dataTable.doubleClickOnRowByName(subFolder2); const item = breadcrumb.items.get(2); - const title = await item.getAttribute('title'); + const title = await BrowserActions.getAttribute(item, 'title'); expect(title).toEqual(subFolder1); }); diff --git a/package-lock.json b/package-lock.json index d12babac1..3ea177a7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "4.5.0-32658", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.5.0-32658.tgz", - "integrity": "sha512-+HVlakCDW7JTDRlwaBBA6NehEnRwD2/evEwv/Ga75Esj+uz/AmHogifC7sAtCyAKuNnMFo+hnIoWEvpSzDq0xg==", + "version": "4.5.0-32744", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.5.0-32744.tgz", + "integrity": "sha512-g2uOtpeijy1oBCV3szXtjhwCCkxkCp8YZzIWgrblTeY1sEEM2craa1hTi3yA0+BIq7JwfHc9NdVtPF6MHnPlkA==", "dev": true, "requires": { "@alfresco/js-api": "4.4.0", @@ -21,17 +21,6 @@ "spdx-license-list": "^5.0.0" }, "dependencies": { - "@alfresco/js-api": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.4.0.tgz", - "integrity": "sha512-TLBXPc01Hi23gOCkkQy2p9lcBZgcCsymOkRPG0exclDaQnpgWBPFn0e+ykm7WA51hHusgZC2sUoZv1Y95nq6MA==", - "dev": true, - "requires": { - "event-emitter": "^0.3.5", - "minimatch": "3.0.4", - "superagent": "^6.0.0" - } - }, "commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", @@ -41,43 +30,43 @@ } }, "@alfresco/adf-content-services": { - "version": "4.5.0-32653", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.5.0-32653.tgz", - "integrity": "sha512-MVcDzQaJIHFlARgmcCaPc6Zp9xGuf4ZIwO1Y/h+xbJ4nY+GZb2A4PUC07kea5Pau1nWKOOg8se3t+Yzc/IPgIg==", + "version": "4.5.0-32744", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.5.0-32744.tgz", + "integrity": "sha512-P51zS/MzNctE3Iq5gi43uxpIjea0GxKybMzxU0zznpcSXE6BCKe3ErkJTpgI1L4cXlrHxu/+UTfB16EPpOPWRA==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "4.5.0-32658", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.5.0-32658.tgz", - "integrity": "sha512-BmEspa7/UAQhrGZNqgbhAjVKvDYhAuAtN2b6OObQW4SOXmR04pMTRpB7c+DxuV22Y/YKQtfRQ8Y+CP79B+b/DA==", + "version": "4.5.0-32744", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.5.0-32744.tgz", + "integrity": "sha512-UY4scMoOoPWSSSalfRWOQgFVPDl4vuQZgKOjVXsoTjJ9AOzXAqK9yvMY0mBPQBjinakD124BLbTmfZzR0ur1OQ==", "requires": { "cropperjs": "1.5.11", "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "4.5.0-32653", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.5.0-32653.tgz", - "integrity": "sha512-AiWXlsxv9XrpBDU1BqthFCIYhn03NCqADcULSGBcAymokUJUKDlby60Giv2/3Sq1ANpVrJCDo5s300ZkS5vhCw==", + "version": "4.5.0-32744", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.5.0-32744.tgz", + "integrity": "sha512-1Xl7ottL45a6O+EIMlzGx1RT4xTCIlW3Clk8XrkUOkXOio6NSIl6IrAsf6W2r1F+BMwXNU5govgFLQ21pNxBhQ==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-testing": { - "version": "4.5.0-32658", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.5.0-32658.tgz", - "integrity": "sha512-yX8QnHg71zeWRjATHkD6j6ecgSMer9lNLb8Esf+QqLAa7CHdlzGOT0KI9+HOWKLgScwiBsVW6ney2u+rWj1vjQ==", + "version": "4.5.0-32744", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.5.0-32744.tgz", + "integrity": "sha512-/iNr20hsLeEYEM1LQ/nn5gzZSKE6bp3LAgvswXCvJ/LvJGfyPAnNbqMj60HnJB8bcUenO5D6hLIahNOjc9VWwQ==", "dev": true, "requires": { "tslib": "^2.0.0" } }, "@alfresco/js-api": { - "version": "4.4.0-3508", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.4.0-3508.tgz", - "integrity": "sha512-12PJiwWn6MetnKam7ASiulooBg0Eo1JpEVwRA4JR5fKKSFnKiyNY55CAEiZ9VNI1moH5GkG65T/OP8fXuDRJuw==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.4.0.tgz", + "integrity": "sha512-TLBXPc01Hi23gOCkkQy2p9lcBZgcCsymOkRPG0exclDaQnpgWBPFn0e+ykm7WA51hHusgZC2sUoZv1Y95nq6MA==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", diff --git a/package.json b/package.json index f821927fe..5b865b4eb 100644 --- a/package.json +++ b/package.json @@ -24,10 +24,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.5.0-32653", - "@alfresco/adf-core": "4.5.0-32658", - "@alfresco/adf-extensions": "4.5.0-32653", - "@alfresco/js-api": "4.4.0-3508", + "@alfresco/adf-content-services": "4.5.0-32744", + "@alfresco/adf-core": "4.5.0-32744", + "@alfresco/adf-extensions": "4.5.0-32744", + "@alfresco/js-api": "4.4.0", "@angular/animations": "10.0.4", "@angular/cdk": "^10.0.2", "@angular/common": "10.0.4", @@ -56,8 +56,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@alfresco/adf-cli": "4.5.0-32658", - "@alfresco/adf-testing": "4.5.0-32658", + "@alfresco/adf-cli": "4.5.0-32744", + "@alfresco/adf-testing": "4.5.0-32744", "@angular-custom-builders/lite-serve": "^0.2.3", "@angular-devkit/build-angular": "^0.1002.0", "@angular-devkit/build-ng-packagr": "^0.1002.0", diff --git a/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts b/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts index 6a6dd1dc9..5a524048e 100755 --- a/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts +++ b/projects/aca-testing-shared/src/components/info-drawer/info-drawer.ts @@ -81,7 +81,8 @@ export class InfoDrawer extends Component { } async getTabTitle(index: number): Promise { - return this.tabLabelsList.get(index - 1).getAttribute('innerText'); + const attributeValue: string = await browser.executeScript(`return arguments[0].innerText`, this.tabLabelsList.get(index - 1)); + return attributeValue || ''; } async getActiveTabTitle(): Promise { diff --git a/projects/aca-testing-shared/src/pages/page.ts b/projects/aca-testing-shared/src/pages/page.ts index a51a69a6f..1f3d5475b 100755 --- a/projects/aca-testing-shared/src/pages/page.ts +++ b/projects/aca-testing-shared/src/pages/page.ts @@ -98,7 +98,8 @@ export abstract class Page { async getSnackBarMessage(): Promise { const elem = await waitElement('.mat-snack-bar-container'); - return elem.getAttribute('innerText'); + const attributeValue: string = await browser.executeScript(`return arguments[0].innerText`, elem); + return attributeValue || ''; } async clickSnackBarAction(): Promise {