From c65d5d8edb99c72af854e2012f66626375000596 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 3 Jul 2024 10:44:18 +0200 Subject: [PATCH 01/10] Add upgrade of 177 to minor version --- .github/workflows/ui-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index ee07a50ab..d460f8cae 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -123,7 +123,7 @@ jobs: nightly: name: Nightly Report if: ${{ github.event_name == 'schedule' }} - needs: + needs: - ui_test_matrix - ui_test runs-on: ubuntu-latest From 54945001a033562cc669d555f548c27e8d0117f8 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 10 Jul 2024 14:28:25 +0200 Subject: [PATCH 02/10] Rebase --- .github/workflows/ui-test/sanity.json | 167 ++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 65f56d73d..d86150cd7 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -2,6 +2,173 @@ "include": [ { "comment": "1.7.8.10 -> 1.7.8.11 PHP 7.1" + "comment": "1.7.8 ~ minor PHP 7.4" + "comment": "1.7.7 ~ minor PHP 7.1 ~ 7.3" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.4", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.4", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.4", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.5", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.5", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.5", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.6", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.6", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.6", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.7", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.7", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.7", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.8", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.8", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.8", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.3" + }, + { + "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" }, { "PS_VERSION_START": "1.7.8.10", From 90e2ab712c182d4d3f2a6696350586807412b828 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 11 Sep 2024 15:26:06 +0200 Subject: [PATCH 03/10] Resolve conflicting file --- .github/workflows/ui-test/sanity.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index d86150cd7..012fac535 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,8 +1,6 @@ { "include": [ { - "comment": "1.7.8.10 -> 1.7.8.11 PHP 7.1" - "comment": "1.7.8 ~ minor PHP 7.4" "comment": "1.7.7 ~ minor PHP 7.1 ~ 7.3" }, { From ad6be027d1baddb1818d550469ff520819c969a7 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Tue, 22 Oct 2024 14:57:41 +0200 Subject: [PATCH 04/10] Test sanity after bug correction --- .github/workflows/ui-test/sanity.json | 167 +++++++++++++------------- 1 file changed, 85 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 012fac535..b4d9b5a95 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,172 +1,175 @@ { "include": [ { - "comment": "1.7.7 ~ minor PHP 7.1 ~ 7.3" + "comment": "1.7.7.0 -> 1.7.7.8 ~ 1.7.8.11 PHP 7.1" }, { "PS_VERSION_START": "1.7.7.0", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_START": "1.7.7.1", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_START": "1.7.7.2", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.3" + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_START": "1.7.7.3", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_START": "1.7.7.4", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_START": "1.7.7.5", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.3" + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_START": "1.7.7.6", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_START": "1.7.7.7", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.2" + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_START": "1.7.7.8", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.1" + }, + { + "comment": "1.7.7.0 -> 1.7.7.8 ~ 8.2.0 PHP 7.2 ~ 7.3" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { - "PS_VERSION_START": "1.7.7.3", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.2" }, { - "PS_VERSION_START": "1.7.7.3", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { - "PS_VERSION_START": "1.7.7.3", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { - "PS_VERSION_START": "1.7.7.4", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", + "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.4", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.4", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.5", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.5", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.5", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.6", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.6", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.6", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.7", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.7", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.7", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.8", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.8", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.8", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", + "PS_VERSION_END": "8.2.0", + "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { - "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" + "comment": "1.7.8 -> 1.7.8.11 PHP 7.1" }, { "PS_VERSION_START": "1.7.8.10", From 341582257a02dbcc13b4fe50a3a00e11fadd5d09 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Tue, 22 Oct 2024 14:59:21 +0200 Subject: [PATCH 05/10] Add some fixes --- .github/workflows/ui-test/sanity.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index b4d9b5a95..efa58ebf1 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,7 +1,7 @@ { "include": [ { - "comment": "1.7.7.0 -> 1.7.7.8 ~ 1.7.8.11 PHP 7.1" + "comment": "1.7.7.0 ~ 1.7.7.8 -> 1.7.8.11 PHP 7.1" }, { "PS_VERSION_START": "1.7.7.0", @@ -58,7 +58,7 @@ "PHP_VERSION": "7.1" }, { - "comment": "1.7.7.0 -> 1.7.7.8 ~ 8.2.0 PHP 7.2 ~ 7.3" + "comment": "1.7.7.0 ~ 1.7.7.8 -> 8.2.0 PHP 7.2 ~ 7.3" }, { "PS_VERSION_START": "1.7.7.0", From 600e50232e5dad28380bf772e2fb8a3bccac248d Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Thu, 24 Oct 2024 16:20:32 +0200 Subject: [PATCH 06/10] Add some fixes --- .github/workflows/ui-test.yml | 2 +- .github/workflows/ui-test/nightly.json | 2 -- .github/workflows/ui-test/sanity.json | 27 ------------------- .../03_CRUDProductWithCombinations.spec.ts | 4 +-- 4 files changed, 3 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index d460f8cae..394b3bbee 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -69,7 +69,7 @@ jobs: - name: Update run: | docker exec -t prestashop php modules/autoupgrade/bin/console update:start --channel=online admin-dev - docker exec -t prestashop chmod 777 -R /var/www/html/var/cache + docker exec -t prestashop chmod 777 -R /var/www/html/var - name: Install dependencies working-directory: tests/UI/ diff --git a/.github/workflows/ui-test/nightly.json b/.github/workflows/ui-test/nightly.json index b2cc25b1a..ea36cda60 100644 --- a/.github/workflows/ui-test/nightly.json +++ b/.github/workflows/ui-test/nightly.json @@ -26,7 +26,6 @@ { "PS_VERSION_START": "1.7.8.4", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { @@ -47,7 +46,6 @@ { "PS_VERSION_START": "1.7.8.8", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index efa58ebf1..a6b159d50 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -6,55 +6,46 @@ { "PS_VERSION_START": "1.7.7.0", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.1", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.2", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.3", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.4", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.5", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.6", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.7", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { "PS_VERSION_START": "1.7.7.8", "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.1" }, { @@ -63,109 +54,91 @@ { "PS_VERSION_START": "1.7.7.0", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.0", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.1", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.1", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.2", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.2", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.3", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.3", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.4", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.4", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.5", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.5", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.6", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.6", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.7", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.7", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { "PS_VERSION_START": "1.7.7.8", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.7.8", "PS_VERSION_END": "8.2.0", - "UPGRADE_CHANNEL": "online", "PHP_VERSION": "7.3" }, { diff --git a/tests/UI/campaigns/sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts b/tests/UI/campaigns/sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts index c6a469406..1bb29da49 100755 --- a/tests/UI/campaigns/sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts +++ b/tests/UI/campaigns/sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts @@ -49,7 +49,7 @@ test.describe('BO - Catalog - Products : CRUD product with combinations', async }, ], }); - // Data to update product with combinations + // Data to update product with combinations const updateProductData: FakerProduct = new FakerProduct({ type: 'combinations', taxRule: 'No tax', @@ -60,7 +60,7 @@ test.describe('BO - Catalog - Products : CRUD product with combinations', async attributes: [ { name: 'color', - values: ['Gray', 'Taupe', 'Red'], + values: ['Gray', 'Grey', 'Taupe', 'Red'], }, { name: 'size', From aae4eca9ba6f0e0e4006cc33d3ebfc90e06b0e64 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Fri, 25 Oct 2024 10:41:37 +0200 Subject: [PATCH 07/10] Fix rollback --- .../sanity/04_cartFO/01_editCheckCart.spec.ts | 12 +++++++++--- tests/UI/package-lock.json | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts b/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts index 818f4cb03..cb6a04bf7 100755 --- a/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts +++ b/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts @@ -14,6 +14,9 @@ import { } from '@playwright/test'; const baseContext: string = 'sanity_cartFO_editCheckCart'; +import semver from 'semver'; + +const psVersion = utilsTest.getPSVersion(); /* Open the FO home page @@ -153,12 +156,15 @@ test.describe('FO - Cart : Check Cart in FO', async () => { await foClassicCartPage.editProductQuantity(page, 2, 2); - // getNumberFromText is used to get the new price ATI const totalPrice = await foClassicCartPage.getATIPrice(page); expect(totalPrice).toBeGreaterThan(totalATI); - // getNumberFromText is used to get the new products number - const productsNumber = await foClassicCartPage.getCartNotificationsNumber(page); + let productsNumber: number = 0; + if (semver.gte(psVersion, '8.0.0')) { + productsNumber = await foClassicCartPage.getCartNotificationsNumber(page); + } else { + productsNumber = await foClassicCartPage.getProductsNumber(page); + } expect(productsNumber).toBeGreaterThan(itemsNumber); }); }); diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json index 831e3d3d7..32ba93bb4 100644 --- a/tests/UI/package-lock.json +++ b/tests/UI/package-lock.json @@ -497,7 +497,7 @@ }, "node_modules/@prestashop-core/ui-testing": { "version": "0.0.12", - "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#3b60a37c0f4f030c16670a17294476d494d5eccf", + "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#38cff1511dd3b56577731a0fd0510f6735c54512", "license": "MIT", "dependencies": { "@faker-js/faker": "^9.0.3", @@ -6726,7 +6726,7 @@ } }, "@prestashop-core/ui-testing": { - "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#3b60a37c0f4f030c16670a17294476d494d5eccf", + "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#38cff1511dd3b56577731a0fd0510f6735c54512", "from": "@prestashop-core/ui-testing@https://github.com/PrestaShop/ui-testing-library#main", "requires": { "@faker-js/faker": "^9.0.3", From a360c9859bfabfe70ad41051c50e0396a07caaf9 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Fri, 25 Oct 2024 11:11:18 +0200 Subject: [PATCH 08/10] Update library --- tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts | 2 +- tests/UI/package-lock.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts b/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts index cb6a04bf7..e9d7e2738 100755 --- a/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts +++ b/tests/UI/campaigns/sanity/04_cartFO/01_editCheckCart.spec.ts @@ -160,7 +160,7 @@ test.describe('FO - Cart : Check Cart in FO', async () => { expect(totalPrice).toBeGreaterThan(totalATI); let productsNumber: number = 0; - if (semver.gte(psVersion, '8.0.0')) { + if (semver.gte(psVersion, '7.8.0')) { productsNumber = await foClassicCartPage.getCartNotificationsNumber(page); } else { productsNumber = await foClassicCartPage.getProductsNumber(page); diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json index 32ba93bb4..7580249c6 100644 --- a/tests/UI/package-lock.json +++ b/tests/UI/package-lock.json @@ -497,7 +497,7 @@ }, "node_modules/@prestashop-core/ui-testing": { "version": "0.0.12", - "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#38cff1511dd3b56577731a0fd0510f6735c54512", + "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#89b7a1315c96954431e4bc91dfed4912f36aeb5c", "license": "MIT", "dependencies": { "@faker-js/faker": "^9.0.3", @@ -6726,7 +6726,7 @@ } }, "@prestashop-core/ui-testing": { - "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#38cff1511dd3b56577731a0fd0510f6735c54512", + "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#89b7a1315c96954431e4bc91dfed4912f36aeb5c", "from": "@prestashop-core/ui-testing@https://github.com/PrestaShop/ui-testing-library#main", "requires": { "@faker-js/faker": "^9.0.3", From a44ff6b407f0977ed6ecc8e54f4c276bf53268c6 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Fri, 25 Oct 2024 14:26:55 +0200 Subject: [PATCH 09/10] Update library --- tests/UI/package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/UI/package-lock.json b/tests/UI/package-lock.json index 7580249c6..1c2e2dba1 100644 --- a/tests/UI/package-lock.json +++ b/tests/UI/package-lock.json @@ -497,7 +497,7 @@ }, "node_modules/@prestashop-core/ui-testing": { "version": "0.0.12", - "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#89b7a1315c96954431e4bc91dfed4912f36aeb5c", + "resolved": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#f667d2abdf74243ff18438ce4b9204546b2fbe41", "license": "MIT", "dependencies": { "@faker-js/faker": "^9.0.3", @@ -6726,7 +6726,7 @@ } }, "@prestashop-core/ui-testing": { - "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#89b7a1315c96954431e4bc91dfed4912f36aeb5c", + "version": "git+ssh://git@github.com/PrestaShop/ui-testing-library.git#f667d2abdf74243ff18438ce4b9204546b2fbe41", "from": "@prestashop-core/ui-testing@https://github.com/PrestaShop/ui-testing-library#main", "requires": { "@faker-js/faker": "^9.0.3", From 78a9e72d9dd283003860f94d525e4103fa50b048 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Fri, 25 Oct 2024 15:28:41 +0200 Subject: [PATCH 10/10] Add 1.7.7 to nightly run --- .github/workflows/ui-test/nightly.json | 141 +++++++++++++++++++++++++ .github/workflows/ui-test/sanity.json | 131 +---------------------- 2 files changed, 144 insertions(+), 128 deletions(-) diff --git a/.github/workflows/ui-test/nightly.json b/.github/workflows/ui-test/nightly.json index ea36cda60..b8e0184b8 100644 --- a/.github/workflows/ui-test/nightly.json +++ b/.github/workflows/ui-test/nightly.json @@ -1,5 +1,146 @@ { "include": [ + { + "comment": "1.7.7.0 ~ 1.7.7.8 -> 1.7.8.11 PHP 7.1" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.4", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.5", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.6", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.7", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "PS_VERSION_START": "1.7.7.8", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1" + }, + { + "comment": "1.7.7.0 ~ 1.7.7.8 -> 8.2.0 PHP 7.2 ~ 7.3" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.0", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.1", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.2", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.3", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.4", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.4", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.5", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.5", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.6", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.6", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.7", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.7", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, + { + "PS_VERSION_START": "1.7.7.8", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.2" + }, + { + "PS_VERSION_START": "1.7.7.8", + "PS_VERSION_END": "8.2.0", + "PHP_VERSION": "7.3" + }, { "comment": "1.7.8.0 ~ 1.7.8.10 -> 1.7.8.11 PHP 7.1" }, diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index a6b159d50..74828dce8 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,7 +1,7 @@ { "include": [ { - "comment": "1.7.7.0 ~ 1.7.7.8 -> 1.7.8.11 PHP 7.1" + "comment": "1.7.7.0 -> 1.7.8.11 PHP 7.1" }, { "PS_VERSION_START": "1.7.7.0", @@ -9,132 +9,7 @@ "PHP_VERSION": "7.1" }, { - "PS_VERSION_START": "1.7.7.1", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.2", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.3", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.4", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.5", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.6", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.7", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "PS_VERSION_START": "1.7.7.8", - "PS_VERSION_END": "1.7.8.11", - "PHP_VERSION": "7.1" - }, - { - "comment": "1.7.7.0 ~ 1.7.7.8 -> 8.2.0 PHP 7.2 ~ 7.3" - }, - { - "PS_VERSION_START": "1.7.7.0", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.0", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.1", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.1", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.2", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.2", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.3", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.3", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.4", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.4", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.5", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.5", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.6", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.6", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.7", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" - }, - { - "PS_VERSION_START": "1.7.7.7", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.3" - }, - { - "PS_VERSION_START": "1.7.7.8", - "PS_VERSION_END": "8.2.0", - "PHP_VERSION": "7.2" + "comment": "1.7.7.8 -> 8.2.0 PHP 7.3" }, { "PS_VERSION_START": "1.7.7.8", @@ -142,7 +17,7 @@ "PHP_VERSION": "7.3" }, { - "comment": "1.7.8 -> 1.7.8.11 PHP 7.1" + "comment": "1.7.8.10 -> 1.7.8.11 PHP 7.1" }, { "PS_VERSION_START": "1.7.8.10",