feat: add ADMIN_API_URL env variable

shopware · Jan 30, 2025 · 452c10a · 452c10a
1 parent b58761b
commit 452c10a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/playwright.config.ts b/playwright.config.ts
@@ -14,7 +14,9 @@ if (process.env['ADMIN_URL']) {
 } else {
   process.env['ADMIN_URL'] = process.env['APP_URL'] + 'admin/';
 }
-
+if (process.env['ADMIN_API_URL']) {
+  process.env['ADMIN_API_URL'] = (process.env['ADMIN_API_URL'] ?? '').replace(/\/+$/, '') + '/';
+}
 if (!process.env['WEBSERVER_COMMAND']) {
   if (process.env['WEBSERVER_COMMAND'] === defaultAppUrl) {
     process.env['WEBSERVER_COMMAND'] = 'docker compose up --pull=always --quiet-pull shopware';

diff --git a/src/services/AdminApiContext.ts b/src/services/AdminApiContext.ts
@@ -23,7 +23,7 @@ export class AdminApiContext {
     public readonly options: AdminApiContextOptions;
 
     private static readonly defaultOptions: AdminApiContextOptions = {
-        app_url: process.env['APP_URL'],
+        app_url: process.env['ADMIN_API_URL'] || process.env['APP_URL'],
         client_id: process.env['SHOPWARE_ACCESS_KEY_ID'],
         client_secret: process.env['SHOPWARE_SECRET_ACCESS_KEY'],
         admin_username: process.env['SHOPWARE_ADMIN_USERNAME'] || 'admin',

diff --git a/src/tasks/shop-admin/Product/SaveProduct.ts b/src/tasks/shop-admin/Product/SaveProduct.ts
@@ -10,7 +10,7 @@ export const SaveProduct = base.extend<{ SaveProduct: Task }, FixtureTypes>({
                 await AdminProductDetail.savePhysicalProductButton.click();
 
                 // Wait until product is saved via API
-                const response = await AdminProductDetail.page.waitForResponse(`${process.env['APP_URL']}api/_action/sync`);
+                const response = await AdminProductDetail.page.waitForResponse(`${process.env['ADMIN_API_URL'] || process.env['APP_URL']}api/_action/sync`);
 
                 // Assertions
                 expect(response.ok()).toBeTruthy();