Skip to content

Commit

Permalink
[ADF-5470] [E2E Automation] Test cases failing on the newest Chrome b… (
Browse files Browse the repository at this point in the history
#7539)

* [ADF-5470] [E2E Automation] Test cases failing on the newest Chrome browser 98
  • Loading branch information
MichalFidor committed Mar 4, 2022
1 parent 14a777c commit 25eaf9d
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 32 deletions.
30 changes: 4 additions & 26 deletions e2e/content-services/directives/delete-directive.e2e.ts
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -174,18 +158,15 @@ 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();
await contentListPage.dataTable.checkContentIsNotDisplayed('Display name', folderInfo.name);
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);
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 1 addition & 5 deletions 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"
}
Expand Up @@ -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';
Expand Down Expand Up @@ -62,6 +62,17 @@ export class DocumentListPage {
await this.dataTable.selectRowWithKeyboard('Display name', nodeName);
}

async selectRowsWithKeyboard(...contentNames: string[]): Promise<void> {
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<void> {
await this.dataTable.rightClickOnRow('Display name', nodeName);
}
Expand Down

0 comments on commit 25eaf9d

Please sign in to comment.