ACS-6323 Fixed e2e

Alfresco · Dec 9, 2023 · b71b67d · b71b67d
1 parent 13c3fa2
commit b71b67d
Showing 1 changed file with 10 additions and 3 deletions.
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
@@ -40,7 +40,8 @@ export class DataTable extends Component {
     cell: '.adf-datatable-cell-container',
     lockOwner: '.aca-locked-by',
     searchResultsRow: 'aca-search-results-row',
-    searchResultsRowLine: 'span'
+    searchResultsRowLine: 'span',
+    dragIcon: '[data-automation-id="adf-datatable-cell-header-drag-icon-name"]'
   };
 
   head = this.byCss('.adf-datatable-header');
@@ -92,11 +93,17 @@ export class DataTable extends Component {
     const sortColumn = await this.getSortedColumnHeaderText();
     let sortOrder = await this.getSortingOrder();
     if (sortColumn !== label) {
-      await this.getColumnHeaderByLabel(label).click();
+      const columnHeader = this.getColumnHeaderByLabel(label);
+      browser.actions().mouseMove(columnHeader).perform();
+      await BrowserVisibility.waitUntilElementIsVisible(this.head.element(by.css(DataTable.selectors.dragIcon)));
+      await columnHeader.click();
       sortOrder = await this.getSortingOrder();
     }
     if (sortOrder !== order) {
-      await this.getColumnHeaderByLabel(label).click();
+      const columnHeader = this.getColumnHeaderByLabel(label);
+      browser.actions().mouseMove(columnHeader).perform();
+      await BrowserVisibility.waitUntilElementIsVisible(this.head.element(by.css(DataTable.selectors.dragIcon)));
+      await columnHeader.click();
     }
   }