From 5930a48bcae2c0b61ff52517395e41936e105d47 Mon Sep 17 00:00:00 2001 From: Progi1984 Date: Mon, 22 Jan 2024 11:54:32 +0100 Subject: [PATCH] Fixed CI --- .github/workflows/ui-test.yml | 4 ++-- tests/UI/playwright.config.ts | 14 +++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 867dafa2..170471d6 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -25,7 +25,7 @@ jobs: run: npm install && npm run build - name: Start containers - run: docker-compose -f "docker-compose.yml" up -d --build + run: docker-compose -f "tests/UI/docker-compose.yml" up -d --build - name: Install dependencies run: npm ci @@ -43,5 +43,5 @@ jobs: if: always() with: name: playwright-report - path: playwright-report/ + path: tests/UI/reports/ retention-days: 30 \ No newline at end of file diff --git a/tests/UI/playwright.config.ts b/tests/UI/playwright.config.ts index 29e999c9..d523cd33 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/prestashop/', + URL: process.env.URL_FO || 'http://localhost:8000/', }; /* @@ -14,8 +14,8 @@ function loadGlobal(): void { global.BO = { URL: process.env.URL_BO || `${global.FO.URL}admin-dev/`, - EMAIL: process.env.LOGIN || 'demo@prestashop.com', - PASSWD: process.env.PASSWD || 'Correct Horse Battery Staple', + EMAIL: process.env.LOGIN || 'admin@prestashop.com', + PASSWD: process.env.PASSWD || 'prestashop', FIRSTNAME: process.env.FIRSTNAME || 'Marc', LASTNAME: process.env.LASTNAME || 'Beier', }; @@ -64,14 +64,6 @@ function loadGlobal(): void { smtpServer: process.env.SMTP_SERVER || 'localhost', silent: true, }; - - global.keycloakConfig = { - keycloakExternalUrl: process.env.KEYCLOAK_URL_EXTERNAL || 'http://127.0.0.1:8003', - keycloakInternalUrl: process.env.KEYCLOAK_URL_INTERNAL || 'http://keycloak:8080', - keycloakAdminUser: process.env.KEYCLOAK_ADMIN_USER || 'admin', - keycloakAdminPass: process.env.KEYCLOAK_ADMIN_PASS || 'admin', - keycloakClientId: process.env.KEYCLOAK_CLIENT_ID || 'KEYCLOAK_CLIENT_ID', - }; } /**