From e44c49411f0c77267dd214d78c728328164ebdd2 Mon Sep 17 00:00:00 2001
From: Progi1984 <franck.lefevre@prestashop.com>
Date: Wed, 24 Jan 2024 11:13:21 +0100
Subject: [PATCH] Use prestashop/prestashop image

---
 .github/workflows/ui-test.yml |  2 +-
 tests/UI/docker-compose.yml   | 17 +++++++++++++----
 tests/UI/playwright.config.ts |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
index bb3fe052..95329fc1 100644
--- a/.github/workflows/ui-test.yml
+++ b/.github/workflows/ui-test.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Start containers
         run: |
           docker-compose -f "docker-compose.yml" up -d --build
-          while ! nc -z localhost 8000; do sleep 1; done;
+          while ! nc -z localhost 80; do sleep 1; done;
         working-directory: tests/UI/
       
       - name: Install dependencies
diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml
index a9549f84..5215ce56 100644
--- a/tests/UI/docker-compose.yml
+++ b/tests/UI/docker-compose.yml
@@ -2,13 +2,22 @@ version: '3.7'
 
 services:
   prestashop:
-    image: prestashop/prestashop-flashlight:${PS_VERSION}
+    image: prestashop/prestashop:${PS_VERSION}
     container_name: prestashop
     depends_on: 
       - mysql
     environment:
-      - DEBUG_MODE=true
-      - PS_DOMAIN=localhost:8000
+      - PS_DEV_MODE=1
+      - PS_DOMAIN=localhost
+      - PS_LANGUAGE=en
+      - PS_COUNTRY=France
+      - PS_INSTALL_AUTO=1
+      - ADMIN_MAIL=admin@prestashop.com
+      - ADMIN_PASSWD=prestashop
+      - DB_SERVER=mysql
+      - DB_USER=prestashop
+      - DB_PASSWD=prestashop
+      - DB_NAME=prestashop
     volumes:
       - type: bind
         # Local Path 
@@ -16,7 +25,7 @@ services:
         # Mount Path
         target: /var/www/html/modules/blockwishlist
     ports:
-      - 8000:80
+      - 80:80
   mysql:
     image: mariadb:lts
     container_name: prestashop-mysql
diff --git a/tests/UI/playwright.config.ts b/tests/UI/playwright.config.ts
index 27a808f4..24f286ad 100644
--- a/tests/UI/playwright.config.ts
+++ b/tests/UI/playwright.config.ts
@@ -4,7 +4,7 @@ import path from 'path';
 
 function loadGlobal(): void  {
   global.FO = {
-    URL: process.env.URL_FO || 'http://localhost:8000/',
+    URL: process.env.URL_FO || 'http://localhost/',
   };
 
   /*