From 60741824fd3d629b6117ed9408f35e54d3476962 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Thu, 11 Jul 2024 10:58:01 +0200 Subject: [PATCH 1/3] Add UI tests --- .github/workflows/ui-test.yml | 2 +- .github/workflows/ui-test/sanity.json | 22 +++++++++++++++++++++- tests/UI/docker-compose.yml | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 5c5b93132..2663e79c4 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -52,7 +52,7 @@ jobs: PS_VERSION: ${{ env.PS_DOCKER }} run: | docker compose -f "docker-compose.yml" up -d --build - bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost/en/)" != "200" ]]; do sleep 5; done' + bash -c 'while [[ "$(curl -L -s -o /dev/null -w %{http_code} http://localhost/)" != "200" ]]; do sleep 5; done' - name: Composer install run: composer install diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index bd2f6d8e9..aa89265af 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,7 +1,27 @@ { "include": [ { - "comment": "1.7.8 ~ minor PHP 7.4" + "comment": "1.7.5 ~ major PHP 7.2" + }, + { + "PS_VERSION_START": "1.7.5.0", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.5.0" + }, + { + "PS_VERSION_START": "1.7.5.1", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2", + "IMG_DOCKER": "1.7.5.1" + }, + { + "comment": "@todo 1.7.5.2" + }, + { + "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" }, { "PS_VERSION_START": "1.7.8.10", diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index 8cbdd804d..b6c3a35b5 100644 --- a/tests/UI/docker-compose.yml +++ b/tests/UI/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: prestashop: - image: prestashop/prestashop:${PS_VERSION}-apache + image: prestashop/prestashop:${PS_VERSION} container_name: prestashop depends_on: - mysql From 3a1be0ac9ccf9ec918018fc297893d0a97e44630 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Thu, 18 Jul 2024 13:24:58 +0200 Subject: [PATCH 2/3] Use mysql 5.7 --- .github/workflows/ui-test/sanity.json | 14 ++++++++------ tests/UI/docker-compose.yml | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index aa89265af..3e696f99b 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -7,21 +7,23 @@ "PS_VERSION_START": "1.7.5.0", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "major", - "PHP_VERSION": "7.2", - "IMG_DOCKER": "1.7.5.0" + "PHP_VERSION": "7.2" }, { "PS_VERSION_START": "1.7.5.1", "PS_VERSION_END": "8.1.7", "UPGRADE_CHANNEL": "major", - "PHP_VERSION": "7.2", - "IMG_DOCKER": "1.7.5.1" + "PHP_VERSION": "7.2" }, { - "comment": "@todo 1.7.5.2" + "PS_VERSION_START": "1.7.5.2", + "PS_VERSION_END": "8.1.7", + "UPGRADE_CHANNEL": "major", + "PHP_VERSION": "7.2" }, + { - "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" + "comment": "1.7.8 ~ minor PHP 7.4" }, { "PS_VERSION_START": "1.7.8.10", diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index b6c3a35b5..6376a4258 100644 --- a/tests/UI/docker-compose.yml +++ b/tests/UI/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: prestashop: - image: prestashop/prestashop:${PS_VERSION} + image: prestashop/prestashop:${PS_VERSION}-apache container_name: prestashop depends_on: - mysql @@ -31,7 +31,7 @@ services: ports: - 80:80 mysql: - image: mariadb:lts + image: mysql:5.7 container_name: prestashop-mysql healthcheck: test: From 1a8220c73a8243cfac9cd49c352247cae9edd6e1 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 18 Sep 2024 09:30:32 +0200 Subject: [PATCH 3/3] Rebase and fix CRUD product with combination --- .../sanity/02_productsBO/03_CRUDProductWithCombinations.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..4d1bb00ff 100755 --- 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', 'Taupe', 'Red'], + values: ['Gray', 'Grey', 'Taupe', 'Red'], }, { name: 'size',