diff --git a/e2e/content-services/document-list/document-list-component.e2e.ts b/e2e/content-services/document-list/document-list-component.e2e.ts index 04498ffde4..2265fe87b3 100644 --- a/e2e/content-services/document-list/document-list-component.e2e.ts +++ b/e2e/content-services/document-list/document-list-component.e2e.ts @@ -731,7 +731,7 @@ describe('Document List Component', () => { }); it('[C291843] Should be able to navigate using nodes hyperlink when activated', () => { - contentServicesPage.enableHyperlinkNavigation() + contentServicesPage.clickHyperlinkNavigationToggle() .checkFileHyperlinkIsEnabled(file.entry.name) .clickFileHyperlink(file.entry.name); viewer.checkFileIsLoaded(); diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts index af790da728..7bc3e26657 100644 --- a/e2e/pages/adf/contentServicesPage.ts +++ b/e2e/pages/adf/contentServicesPage.ts @@ -66,19 +66,19 @@ export class ContentServicesPage { shareNodeButton = element(by.cssContainingText('mat-icon', ' share ')); clickFileHyperlink(fileName) { - let hyperlink = element(by.cssContainingText('adf-name-column[class*="adf-datatable-link"] span', fileName)); + let hyperlink = this.contentList.getFileHyperlink(fileName); Util.waitUntilElementIsClickable(hyperlink); hyperlink.click(); return this; } checkFileHyperlinkIsEnabled(fileName) { - let hyperlink = element(by.cssContainingText('adf-name-column[class*="adf-datatable-link"] span', fileName)); + let hyperlink = this.contentList.getFileHyperlink(fileName); Util.waitUntilElementIsVisible(hyperlink); return this; } - enableHyperlinkNavigation() { + clickHyperlinkNavigationToggle() { let hyperlinkToggle = element(by.cssContainingText('.mat-slide-toggle-content', 'Hyperlink navigation')); Util.waitUntilElementIsVisible(hyperlinkToggle); hyperlinkToggle.click(); diff --git a/e2e/pages/adf/dataTablePage.ts b/e2e/pages/adf/dataTablePage.ts index 131f077a89..dda2778120 100644 --- a/e2e/pages/adf/dataTablePage.ts +++ b/e2e/pages/adf/dataTablePage.ts @@ -44,6 +44,10 @@ export class DataTablePage { this.list = this.rootElement.all(by.css(`div[class*=adf-datatable-body] div[class*=adf-datatable-row]`)); } + getFileHyperlink(filename) { + return element(by.cssContainingText('adf-name-column[class*="adf-datatable-link"] span', filename)); + } + getAllDisplayedRows() { return element.all(this.rows).count(); } diff --git a/e2e/pages/adf/dialog/contentListPage.ts b/e2e/pages/adf/dialog/contentListPage.ts index b9d4facce8..6bd393637d 100644 --- a/e2e/pages/adf/dialog/contentListPage.ts +++ b/e2e/pages/adf/dialog/contentListPage.ts @@ -16,10 +16,12 @@ */ import { browser, by, element, protractor } from 'protractor'; +import { DataTablePage } from '../dataTablePage'; import { Util } from '../../../util/util'; export class ContentListPage { + dataTable = new DataTablePage(); deleteContentElement = element(by.css('button[data-automation-id*="DELETE"]')); metadataAction = element(by.css('button[data-automation-id*="METADATA"]')); versionManagerAction = element(by.css('button[data-automation-id*="VERSIONS"]')); @@ -42,6 +44,10 @@ export class ContentListPage { table = element.all(by.css('adf-datatable')).first(); tableBody = element.all(by.css('adf-document-list div[class="adf-datatable-body"]')).first(); + getFileHyperlink(fileName) { + return this.dataTable.getFileHyperlink(fileName); + } + getColumnLocator(column) { return by.css(`div[id*='document-list-container'] div[class*='adf-datatable-row'] div[title='${column}'] span`); }