From 96891315200703efbc47b98833d5dc569db08e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Seku=C5=82a?= Date: Tue, 19 Apr 2022 16:56:51 +0200 Subject: [PATCH] [ACA-4578] Fix for datatable e2e-s (#2511) --- e2e/protractor.excludes.json | 9 +-------- .../src/components/data-table/data-table.ts | 6 +++--- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/e2e/protractor.excludes.json b/e2e/protractor.excludes.json index a54104efd..725e2bb0b 100644 --- a/e2e/protractor.excludes.json +++ b/e2e/protractor.excludes.json @@ -1,11 +1,4 @@ { "C589205": "https://alfresco.atlassian.net/browse/ACA-4353", - "C261153": "https://alfresco.atlassian.net/browse/AAE-7517", - - "C213171": "https://alfresco.atlassian.net/browse/ACA-4578", - "C213115": "https://alfresco.atlassian.net/browse/ACA-4578", - "C261138": "https://alfresco.atlassian.net/browse/ACA-4578", - "C261139": "https://alfresco.atlassian.net/browse/ACA-4578", - "C261147": "https://alfresco.atlassian.net/browse/ACA-4578", - "C213219": "https://alfresco.atlassian.net/browse/ACA-4578" + "C261153": "https://alfresco.atlassian.net/browse/AAE-7517" } diff --git a/projects/aca-testing-shared/src/components/data-table/data-table.ts b/projects/aca-testing-shared/src/components/data-table/data-table.ts index 400098820..fac9cef34 100755 --- a/projects/aca-testing-shared/src/components/data-table/data-table.ts +++ b/projects/aca-testing-shared/src/components/data-table/data-table.ts @@ -34,8 +34,8 @@ export class DataTable extends Component { private static selectors = { columnHeader: '.adf-datatable-row .adf-datatable-cell-header .adf-datatable-cell-value', sortedColumnHeader: ` - .adf-datatable__header--sorted-asc .adf-datatable-cell-value, - .adf-datatable__header--sorted-desc .adf-datatable-cell-value + .adf-datatable__header--sorted-asc .adf-datatable-cell-header-content .adf-datatable-cell-value, + .adf-datatable__header--sorted-desc .adf-datatable-cell-header-content .adf-datatable-cell-value `, row: '.adf-datatable-row[data-automation-id^="datatable-row"]', cell: '.adf-datatable-cell-container', @@ -127,7 +127,7 @@ export class DataTable extends Component { } async getSortingOrder(): Promise { - const str = await this.getSortedColumnHeader().element(by.xpath('..')).getAttribute('class'); + const str = await this.getSortedColumnHeader().element(by.xpath('../..')).getAttribute('class'); if (str.includes('asc')) { return 'asc'; }