diff --git a/e2e/content-services/directives/delete-directive.e2e.ts b/e2e/content-services/directives/delete-directive.e2e.ts index e5164aa0b6..fdc3ef5623 100644 --- a/e2e/content-services/directives/delete-directive.e2e.ts +++ b/e2e/content-services/directives/delete-directive.e2e.ts @@ -134,20 +134,7 @@ describe('Delete Directive', () => { }); it('[C260188] Delete multiple content', async () => { - await contentListPage.selectRowWithKeyboard(txtFileModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.selectRowWithKeyboard(file0BytesModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', file0BytesModel.name); - await contentListPage.selectRowWithKeyboard(folderSecond.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', file0BytesModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', folderSecond.name); - await contentListPage.selectRowWithKeyboard(folderInfo.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', folderInfo.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', file0BytesModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', folderSecond.name); + await contentListPage.selectRowsWithKeyboard(txtFileModel.name, file0BytesModel.name, folderSecond.name, folderInfo.name); await contentServicesPage.clickDeleteOnToolbar(); await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', folderInfo.name); await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', txtFileModel.name); @@ -156,10 +143,7 @@ describe('Delete Directive', () => { }); it('[C260192] Delete file and folder with hierarchy', async () => { - await contentListPage.selectRowWithKeyboard(txtFileModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.selectRowWithKeyboard(folderInfo.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', folderInfo.name); + await contentListPage.selectRowsWithKeyboard(txtFileModel.name, folderInfo.name); await contentServicesPage.clickDeleteOnToolbar(); await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', txtFileModel.name); await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', folderInfo.name); @@ -174,7 +158,7 @@ describe('Delete Directive', () => { await contentServicesPage.chooseSelectionMode('Single'); await contentListPage.selectRow(txtFileModel.name); await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.selectRowWithKeyboard(folderInfo.name); + await contentListPage.selectRowsWithKeyboard(folderInfo.name); await contentListPage.dataTable.checkRowIsSelected('Display name', folderInfo.name); await contentListPage.dataTable.checkRowIsNotSelected('Display name', txtFileModel.name); await contentServicesPage.clickDeleteOnToolbar(); @@ -182,10 +166,7 @@ describe('Delete Directive', () => { await contentListPage.dataTable.checkContentIsDisplayed('Display name', txtFileModel.name); await contentServicesPage.chooseSelectionMode('Multiple'); - await contentListPage.selectRow(txtFileModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', txtFileModel.name); - await contentListPage.selectRowWithKeyboard(file0BytesModel.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', file0BytesModel.name); + await contentListPage.selectRowsWithKeyboard(txtFileModel.name, file0BytesModel.name); await contentServicesPage.clickDeleteOnToolbar(); await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', txtFileModel.name); await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', file0BytesModel.name); @@ -282,9 +263,6 @@ describe('Delete Directive', () => { await contentListPage.selectRowWithKeyboard(folderB.entry.name); await contentListPage.dataTable.checkRowIsSelected('Display name', folderB.entry.name); await expect(await contentServicesPage.checkToolbarDeleteIsDisabled()).toEqual(true); - await contentListPage.selectRowWithKeyboard(folderA.entry.name); - await contentListPage.dataTable.checkRowIsSelected('Display name', folderA.entry.name); - await expect(await contentServicesPage.checkToolbarDeleteIsDisabled()).toEqual(true); await contentListPage.selectRowWithKeyboard(fileTxt.entry.name); await contentListPage.dataTable.checkRowIsSelected('Display name', fileTxt.entry.name); await expect(await contentServicesPage.checkToolbarDeleteIsDisabled()).toEqual(true); diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json index c48e8bb22f..5a660247d6 100644 --- a/e2e/protractor.excludes.json +++ b/e2e/protractor.excludes.json @@ -1,10 +1,6 @@ { "C269081": "https://alfresco.atlassian.net/browse/ADF-5385", "C272819": "https://alfresco.atlassian.net/browse/ADF-5385", - "C260188": "https://alfresco.atlassian.net/browse/ADF-5470", - "C260192": "https://alfresco.atlassian.net/browse/ADF-5470", - "C260193": "https://alfresco.atlassian.net/browse/ADF-5470", - "C216426": "https://alfresco.atlassian.net/browse/ADF-5470", - "C362241": "https://alfresco.atlassian.net/browse/ADF-5470", + "C362241": "https://alfresco.atlassian.net/browse/ADF-5385", "C260517": "https://alfresco.atlassian.net/browse/AAE-7705" } diff --git a/lib/testing/src/lib/protractor/content-services/pages/document-list.page.ts b/lib/testing/src/lib/protractor/content-services/pages/document-list.page.ts index cb5110219a..f4f6ea602a 100644 --- a/lib/testing/src/lib/protractor/content-services/pages/document-list.page.ts +++ b/lib/testing/src/lib/protractor/content-services/pages/document-list.page.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { by, ElementFinder, browser, $$ } from 'protractor'; +import { by, ElementFinder, browser, $$, protractor } from 'protractor'; import { DataTableComponentPage } from '../../core/pages/data-table-component.page'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; @@ -62,6 +62,17 @@ export class DocumentListPage { await this.dataTable.selectRowWithKeyboard('Display name', nodeName); } + async selectRowsWithKeyboard(...contentNames: string[]): Promise { + let option: any; + await browser.actions().sendKeys(protractor.Key.COMMAND).perform(); + for (const name of contentNames) { + option = await this.dataTable.getRow('Display name', name); + await option.click(); + await this.dataTable.checkRowIsSelected('Display name', name); + } + await browser.actions().sendKeys(protractor.Key.NULL).perform(); + } + async rightClickOnRow(nodeName: string): Promise { await this.dataTable.rightClickOnRow('Display name', nodeName); }