Rebase

PrestaShop · Oct 23, 2024 · e6b4b86 · e6b4b86
1 parent 6b8b2a0
commit e6b4b86
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json
@@ -1,46 +1,44 @@
 {
   "include": [
     {
-      "comment": "1.7.5 ~ minor PHP 7.1 ~ 7.2"
+      "comment": "1.7.5.0 ~ 1.7.5.2 -> 1.7.8.11 PHP 7.1"
     },
     {
       "PS_VERSION_START": "1.7.5.0",
       "PS_VERSION_END": "1.7.8.11",
-      "UPGRADE_CHANNEL": "minor",
       "PHP_VERSION": "7.1"
     },
+
     {
-      "PS_VERSION_START": "1.7.5.0",
+      "PS_VERSION_START": "1.7.5.1",
       "PS_VERSION_END": "1.7.8.11",
-      "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.2"
+      "PHP_VERSION": "7.1"
     },
+
     {
-      "PS_VERSION_START": "1.7.5.1",
+      "PS_VERSION_START": "1.7.5.2",
       "PS_VERSION_END": "1.7.8.11",
-      "UPGRADE_CHANNEL": "minor",
       "PHP_VERSION": "7.1"
     },
     {
-      "PS_VERSION_START": "1.7.5.1",
-      "PS_VERSION_END": "1.7.8.11",
-      "UPGRADE_CHANNEL": "minor",
+      "comment": "1.7.5.0 ~ 1.7.5.2 -> 8.2.0 PHP 7.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.5.0",
+      "PS_VERSION_END": "8.2.0",
       "PHP_VERSION": "7.2"
     },
     {
-      "PS_VERSION_START": "1.7.5.2",
-      "PS_VERSION_END": "1.7.8.11",
-      "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.1"
+      "PS_VERSION_START": "1.7.5.1",
+      "PS_VERSION_END": "8.2.0",
+      "PHP_VERSION": "7.2"
     },
     {
       "PS_VERSION_START": "1.7.5.1",
-      "PS_VERSION_END": "1.7.8.11",
-      "UPGRADE_CHANNEL": "minor",
+      "PS_VERSION_END": "8.2.0",
       "PHP_VERSION": "7.2"
     },
     {
-      "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4"
       "comment": "1.7.8.10 -> 1.7.8.11 PHP 7.1"
     },
     {

diff --git a/tests/UI/campaigns/sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts b/tests/UI/campaigns/sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts
@@ -60,7 +60,7 @@ test.describe('BO - Catalog - Products : CRUD product with combinations', async
     attributes: [
       {
         name: 'color',
-        values: ['Gray', 'Grey', 'Taupe', 'Red'],
+        values: ['Gray', 'Grey', 'Grey', 'Taupe', 'Red'],
       },
       {
         name: 'size',