Merge pull request PrestaShop#22209 from boubkerbribri/fix-sort

Backport fix on UI sort tests
lfymcc · Dec 3, 2020 · bf85c2e · bf85c2e
2 parents e2e5983 + 659cba6
commit bf85c2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...paigns/functional/BO/03_catalog/07_discounts/01_cartRules/03_sortAndPaginationCartRule.js b/...paigns/functional/BO/03_catalog/07_discounts/01_cartRules/03_sortAndPaginationCartRule.js
@@ -171,12 +171,12 @@ describe('Sort and pagination cart rules', async () => {
       },
       {
         args: {
-          testIdentifier: 'sortByDateAsc', sortBy: 'date', sortDirection: 'up',
+          testIdentifier: 'sortByDateAsc', sortBy: 'date', sortDirection: 'up', isDate: true,
         },
       },
       {
         args: {
-          testIdentifier: 'sortByDateDesc', sortBy: 'date', sortDirection: 'down',
+          testIdentifier: 'sortByDateDesc', sortBy: 'date', sortDirection: 'down', isDate: true,
         },
       },
       {
@@ -200,7 +200,7 @@ describe('Sort and pagination cart rules', async () => {
           sortedTable = await sortedTable.map(text => parseFloat(text));
         }
 
-        const expectedResult = await cartRulesPage.sortArray(nonSortedTable, test.args.isFloat);
+        const expectedResult = await cartRulesPage.sortArray(nonSortedTable, test.args.isFloat, test.args.isDate);
 
         if (test.args.sortDirection === 'up') {
           await expect(sortedTable).to.deep.equal(expectedResult);

diff --git a/tests/UI/pages/commonPage.js b/tests/UI/pages/commonPage.js
@@ -312,10 +312,15 @@ module.exports = class CommonPage {
    * @param isFloat
    * @return {Promise<*>}
    */
-  async sortArray(arrayToSort, isFloat = false) {
+  async sortArray(arrayToSort, isFloat = false, isDate = false) {
     if (isFloat) {
       return arrayToSort.sort((a, b) => a - b);
     }
+
+    if (isDate) {
+      return arrayToSort.sort((a, b) => new Date(a) - new Date(b));
+    }
+
     return arrayToSort.sort((a, b) => a.localeCompare(b));
   }