From 12e9e2a221e80e55017383cde95a375f63bad29d Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 28 Feb 2023 22:42:13 +0000 Subject: [PATCH] e2e fix --- e2e/suites/navigation/sidebar.test.ts | 14 ----------- .../src/components/sidenav/sidenav.ts | 24 +------------------ .../src/pages/browsing-page.ts | 6 ----- 3 files changed, 1 insertion(+), 43 deletions(-) diff --git a/e2e/suites/navigation/sidebar.test.ts b/e2e/suites/navigation/sidebar.test.ts index 777897cd0..b51edf149 100755 --- a/e2e/suites/navigation/sidebar.test.ts +++ b/e2e/suites/navigation/sidebar.test.ts @@ -47,20 +47,6 @@ describe('Sidebar', () => { expect(await sidenav.isActive(SIDEBAR_LABELS.PERSONAL_FILES)).toBe(true, 'Default active link'); }); - it('[C217150] File Libraries has correct sub-categories', async () => { - await page.clickFileLibraries(); - expect(await sidenav.isFileLibrariesMenuExpanded()).toBe(true, 'File Libraries not expanded'); - expect(await sidenav.getLink(SIDEBAR_LABELS.MY_LIBRARIES).isPresent()).toBe(true, 'My Libraries link not present'); - expect(await sidenav.getLink(SIDEBAR_LABELS.FAVORITE_LIBRARIES).isPresent()).toBe(true, 'Favorite Libraries link not present'); - }); - - it('[C289900] Favorite Libraries is automatically selected on expanding File Libraries', async () => { - await sidenav.expandFileLibraries(); - expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.FAVORITE_LIBRARIES); - expect(await sidenav.isActive(SIDEBAR_LABELS.FILE_LIBRARIES)).toBe(true, 'File Libraries is not active'); - expect(await sidenav.isActive(SIDEBAR_LABELS.FAVORITE_LIBRARIES)).toBe(true, 'Favorite Libraries link not active'); - }); - it('[C289902] navigate to Favorite Libraries', async () => { await page.goToFavoriteLibraries(); expect(await browser.getCurrentUrl()).toContain(APP_ROUTES.FAVORITE_LIBRARIES); diff --git a/projects/aca-testing-shared/src/components/sidenav/sidenav.ts b/projects/aca-testing-shared/src/components/sidenav/sidenav.ts index c6da7a919..a71794765 100755 --- a/projects/aca-testing-shared/src/components/sidenav/sidenav.ts +++ b/projects/aca-testing-shared/src/components/sidenav/sidenav.ts @@ -25,7 +25,7 @@ import { ElementFinder, by, element, browser } from 'protractor'; import { Logger, BrowserActions } from '@alfresco/adf-testing'; -import { SIDEBAR_LABELS, BROWSER_WAIT_TIMEOUT } from '../../configs'; +import { BROWSER_WAIT_TIMEOUT } from '../../configs'; import { Menu } from '../menu/menu'; import { Component } from '../component'; @@ -48,20 +48,6 @@ export class Sidenav extends Component { super('app-sidenav', ancestor); } - private async expandMenu(name: string): Promise { - try { - if (await element(by.cssContainingText('.mat-expanded', name)).isPresent()) { - return Promise.resolve(); - } else { - const link = this.getLink(name); - await BrowserActions.click(link); - await element(by.css('.mat-expansion-panel-body')).isPresent(); - } - } catch (e) { - Logger.error(`---- sidebar navigation catch expandMenu: failed to expand ${name} menu : `, e); - } - } - async openNewMenu(): Promise { await BrowserActions.click(this.newButton.first()); await this.menu.waitForMenuToOpen(); @@ -147,12 +133,4 @@ export class Sidenav extends Component { Logger.error(`---- clickLink catch : sidebar navigation failed to click on - ${name} : `, error); } } - - async isFileLibrariesMenuExpanded(): Promise { - return element(by.cssContainingText('.mat-expanded', SIDEBAR_LABELS.FILE_LIBRARIES)).isPresent(); - } - - async expandFileLibraries(): Promise { - await this.expandMenu(SIDEBAR_LABELS.FILE_LIBRARIES); - } } diff --git a/projects/aca-testing-shared/src/pages/browsing-page.ts b/projects/aca-testing-shared/src/pages/browsing-page.ts index 4d98bf7ef..24b6cc563 100755 --- a/projects/aca-testing-shared/src/pages/browsing-page.ts +++ b/projects/aca-testing-shared/src/pages/browsing-page.ts @@ -54,9 +54,6 @@ export class BrowsingPage extends Page { } async goToFavoriteLibraries(): Promise { - if (!(await this.sidenav.isFileLibrariesMenuExpanded())) { - await this.sidenav.expandFileLibraries(); - } await this.sidenav.clickLink(SIDEBAR_LABELS.FAVORITE_LIBRARIES); } @@ -66,9 +63,6 @@ export class BrowsingPage extends Page { } async goToMyLibraries(): Promise { - if (!(await this.sidenav.isFileLibrariesMenuExpanded())) { - await this.sidenav.expandFileLibraries(); - } await this.sidenav.clickLink(SIDEBAR_LABELS.MY_LIBRARIES); }