fix: setup as own project

shopware · Feb 14, 2025 · 3029332 · 3029332
1 parent c88fa67
commit 3029332
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/tests/acceptance/fixtures/PayPalAccountFixture.ts b/tests/acceptance/fixtures/PayPalAccountFixture.ts
diff --git a/tests/acceptance/global.types.ts b/tests/acceptance/global.types.ts
@@ -6,7 +6,6 @@ import type { ShopAdminTasks } from '@tasks/ShopAdminTasks';
 import type { ShopCustomerTasks } from '@tasks/ShopCustomerTasks';
 
 interface TestFixtureTypes extends AdminPageTypes, StorefrontPageTypes, DataFixtureTypes, ShopAdminTasks, ShopCustomerTasks {
-    DefaultPayPalAccount: () => Promise<void>
 }
 
 declare global {

diff --git a/tests/acceptance/playwright.config.ts b/tests/acceptance/playwright.config.ts
@@ -45,6 +45,11 @@ export default defineConfig({
     },
 
     projects: [
+        {
+            name: 'PayPal Setup',
+            testMatch: /.*\.setup\.ts/,
+            use: { trace: 'off' },
+        },
         {
             name: 'PayPal',
             use: {

diff --git a/tests/acceptance/setup/paypal-account.setup.ts b/tests/acceptance/setup/paypal-account.setup.ts
@@ -0,0 +1,35 @@
+// eslint-disable playwright/no-conditional-expect
+import { test } from '@fixtures/AcceptanceTest';
+import { expect } from '@shopware-ag/acceptance-test-suite';
+import type * as PayPal from 'SwagPayPal/types';
+
+test('PayPal Account setup', {}, async ({ AdminApiContext }) => {
+    const isSandbox = Boolean(process.env.PAYPAL_SANDBOX);
+    const prefix = isSandbox ? 'Sandbox' : '';
+    const clientId = String(process.env.PAYPAL_CLIENT_ID);
+    const clientSecret = String(process.env.PAYPAL_CLIENT_SECRET);
+    const merchantId = String(process.env.PAYPAL_MERCHANT_ID);
+
+    const response = await AdminApiContext.post('./_action/paypal/save-settings', {
+        data: {
+            null: {
+                [`SwagPayPal.settings.clientId${prefix}`]: clientId,
+                [`SwagPayPal.settings.clientSecret${prefix}`]: clientSecret,
+                [`SwagPayPal.settings.merchantPayerId${prefix}`]: merchantId,
+                'SwagPayPal.settings.sandbox': isSandbox,
+            },
+        },
+    });
+
+    expect(response.ok()).toBeTruthy();
+
+    const json = await response.json() as PayPal.Api.Operations<'saveSettings'>;
+
+    expect(json).toHaveProperty('null');
+
+    if (json.null.sandboxCredentialsChanged) {
+        expect(json.null.sandboxCredentialsValid).toBeTruthy();
+    } else if (json.null.liveCredentialsChanged) {
+        expect(json.null.liveCredentialsValid).toBeTruthy();
+    }
+});
diff --git a/tests/acceptance/tests/Settings/ShippingCarrier.spec.ts b/tests/acceptance/tests/Settings/ShippingCarrier.spec.ts
@@ -2,7 +2,6 @@ import { test } from '@fixtures/AcceptanceTest';
 
 test('As an admin, I can select a standard carrier that is used to be displayed by PayPal', { tag: ['@Settings'] }, async ({
     ShopAdmin,
-    DefaultPayPalAccount,
     AdminShippingDetail,
     TestDataService,
     SetStandardCarrier,