diff --git a/e2e/content-services/directives/restore-content-directive.e2e.ts b/e2e/content-services/directives/restore-content-directive.e2e.ts index 15834b98a5..f00fb895b6 100644 --- a/e2e/content-services/directives/restore-content-directive.e2e.ts +++ b/e2e/content-services/directives/restore-content-directive.e2e.ts @@ -23,8 +23,7 @@ import { browser } from 'protractor'; import { FileModel } from '../../models/ACS/file.model'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; import { TrashcanPage } from '../../pages/adf/trashcan.page'; -import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions } from '@alfresco/adf-testing'; -import { BreadCrumbPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb.page'; +import { LoginPage, NotificationHistoryPage, StringUtil, UploadActions, BrowserActions, BreadcrumbPage } from '@alfresco/adf-testing'; describe('Restore content directive', () => { @@ -34,7 +33,7 @@ describe('Restore content directive', () => { const acsUser = new AcsUserModel(); const anotherAcsUser = new AcsUserModel(); const trashcanPage = new TrashcanPage(); - const breadCrumbPage = new BreadCrumbPage(); + const breadCrumbPage = new BreadcrumbPage(); const notificationHistoryPage = new NotificationHistoryPage(); this.alfrescoJsApi = new AlfrescoApi({ diff --git a/e2e/content-services/document-list/document-list-actions.e2e.ts b/e2e/content-services/document-list/document-list-actions.e2e.ts index ab2ebbed5d..497b73b4aa 100644 --- a/e2e/content-services/document-list/document-list-actions.e2e.ts +++ b/e2e/content-services/document-list/document-list-actions.e2e.ts @@ -17,11 +17,13 @@ import { browser, by, element } from 'protractor'; import { + BreadcrumbPage, LoginPage, PaginationPage, UploadActions, StringUtil, - ContentNodeSelectorDialogPage, ViewerPage + ContentNodeSelectorDialogPage, + ViewerPage } from '@alfresco/adf-testing'; import { ContentServicesPage } from '../../pages/adf/content-services.page'; import { NavigationBarPage } from '../../pages/adf/navigation-bar.page'; @@ -30,7 +32,6 @@ import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api'; import { FileModel } from '../../models/ACS/file.model'; import { Util } from '../../util/util'; import { BreadCrumbDropdownPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb-dropdown.page'; -import { BreadCrumbPage } from '../../pages/adf/content-services/breadcrumb/bread-crumb.page'; import { InfinitePaginationPage } from '../../pages/adf/core/infinite-pagination.page'; import { FolderModel } from '../../models/ACS/folder.model'; @@ -43,7 +44,7 @@ describe('Document List Component - Actions', () => { const contentNodeSelector = new ContentNodeSelectorDialogPage(); const paginationPage = new PaginationPage(); const breadCrumbDropdownPage = new BreadCrumbDropdownPage(); - const breadCrumbPage = new BreadCrumbPage(); + const breadCrumbPage = new BreadcrumbPage(); const viewerPage = new ViewerPage(); this.alfrescoJsApi = new AlfrescoApi({ provider: 'ECM', diff --git a/e2e/pages/adf/content-services/breadcrumb/bread-crumb.page.ts b/lib/testing/src/lib/core/pages/bread-crumb.page.ts similarity index 68% rename from e2e/pages/adf/content-services/breadcrumb/bread-crumb.page.ts rename to lib/testing/src/lib/core/pages/bread-crumb.page.ts index ba863e82ef..fa340afd82 100644 --- a/e2e/pages/adf/content-services/breadcrumb/bread-crumb.page.ts +++ b/lib/testing/src/lib/core/pages/bread-crumb.page.ts @@ -16,15 +16,20 @@ */ import { element, by, ElementFinder } from 'protractor'; -import { BrowserActions } from '@alfresco/adf-testing'; +import { BrowserActions } from '../utils/browser-actions'; -export class BreadCrumbPage { +export class BreadcrumbPage { - breadCrumb: ElementFinder = element(by.css(`adf-breadcrumb nav[data-automation-id='breadcrumb']`)); + breadcrumb: ElementFinder = element(by.css(`adf-breadcrumb nav[data-automation-id='breadcrumb']`)); + currentItem: ElementFinder = element(by.css('.adf-breadcrumb-item-current')); async chooseBreadCrumb(breadCrumbItem): Promise { - const path = this.breadCrumb.element(by.css(`a[data-automation-id='breadcrumb_${breadCrumbItem}']`)); + const path = this.breadcrumb.element(by.css(`a[data-automation-id='breadcrumb_${breadCrumbItem}']`)); await BrowserActions.click(path); } + async getActiveBreadCrumbItemName(): Promise { + return this.currentItem.getText(); + } + } diff --git a/lib/testing/src/lib/core/pages/public-api.ts b/lib/testing/src/lib/core/pages/public-api.ts index 2e44ef88ed..0213d4b94d 100644 --- a/lib/testing/src/lib/core/pages/public-api.ts +++ b/lib/testing/src/lib/core/pages/public-api.ts @@ -15,6 +15,7 @@ * limitations under the License. */ +export * from './bread-crumb.page'; export * from './header.page'; export * from './user-info.page'; export * from './login.page';