@shopware-ag/acceptance-test-suite 2.2.0 → 2.3.0

package/dist/index.d.mts

@@ -2,6 +2,7 @@ import * as _playwright_test from '@playwright/test';
 import { APIRequestContext, APIResponse, Page, Locator } from '@playwright/test';
 export * from '@playwright/test';
 import * as playwright_core from 'playwright-core';
+import { Page as Page$1 } from 'playwright-core';
 import { components } from '@shopware/api-client/admin-api-types';
 import { Image } from 'image-js';
 
@@ -531,7 +532,6 @@ interface DefaultSalesChannelTypes {
         salesChannel: SalesChannel;
         customer: Customer;
         url: string;
-        themeSeed: string | null;
     };
     DefaultStorefront: {
         salesChannel: SalesChannel;
@@ -999,6 +999,7 @@ type OrderStatus = 'cancel' | 'complete' | 'reopen' | 'process';
 declare const setOrderStatus: (orderId: string, orderStatus: OrderStatus, adminApiContext: AdminApiContext) => Promise<APIResponse>;
 
 declare const isSaaSInstance: (adminApiContext: AdminApiContext) => Promise<boolean>;
+declare const isThemeCompiled: (page: Page$1) => Promise<boolean>;
 
 declare function createRandomImage(width?: number, height?: number): Image;
 
@@ -1038,4 +1039,4 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ValidateAccessibility: (pageName: string, assertViolations?: boolean | undefined, createReport?: boolean | undefined, ruleTags?: string[] | undefined, outputDir?: string | undefined) => () => Promise<void>;
 }, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
-export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, setOrderStatus, test };
+export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import * as _playwright_test from '@playwright/test';
 import { APIRequestContext, APIResponse, Page, Locator } from '@playwright/test';
 export * from '@playwright/test';
 import * as playwright_core from 'playwright-core';
+import { Page as Page$1 } from 'playwright-core';
 import { components } from '@shopware/api-client/admin-api-types';
 import { Image } from 'image-js';
 
@@ -531,7 +532,6 @@ interface DefaultSalesChannelTypes {
         salesChannel: SalesChannel;
         customer: Customer;
         url: string;
-        themeSeed: string | null;
     };
     DefaultStorefront: {
         salesChannel: SalesChannel;
@@ -999,6 +999,7 @@ type OrderStatus = 'cancel' | 'complete' | 'reopen' | 'process';
 declare const setOrderStatus: (orderId: string, orderStatus: OrderStatus, adminApiContext: AdminApiContext) => Promise<APIResponse>;
 
 declare const isSaaSInstance: (adminApiContext: AdminApiContext) => Promise<boolean>;
+declare const isThemeCompiled: (page: Page$1) => Promise<boolean>;
 
 declare function createRandomImage(width?: number, height?: number): Image;
 
@@ -1038,4 +1039,4 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ValidateAccessibility: (pageName: string, assertViolations?: boolean | undefined, createReport?: boolean | undefined, ruleTags?: string[] | undefined, outputDir?: string | undefined) => () => Promise<void>;
 }, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
-export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, setOrderStatus, test };
+export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/dist/index.mjs

@@ -204,6 +204,18 @@ const isSaaSInstance = async (adminApiContext) => {
   const instanceFeatures = await adminApiContext.get("./instance/features");
   return instanceFeatures.ok();
 };
+const isThemeCompiled = async (page) => {
+  let allCSSFound = false;
+  const listener = (request) => {
+    if (request.url().includes("all.css")) {
+      allCSSFound = true;
+    }
+  };
+  page.on("request", listener);
+  await page.goto("./", { waitUntil: "load" });
+  page.off("request", listener);
+  return allCSSFound;
+};
 
 const test$a = test$c.extend({
   SalesChannelBaseConfig: [
@@ -247,26 +259,6 @@ const test$a = test$c.extend({
       const { uuid: domainUuid } = IdProvider.getWorkerDerivedStableId("domain");
       const { uuid: customerUuid } = IdProvider.getWorkerDerivedStableId("customer");
       const baseUrl = `${SalesChannelBaseConfig.appUrl}test-${uuid}/`;
-      const response = await AdminApiContext.post(`./search/system-config`, {
-        data: {
-          page: 1,
-          limit: 1,
-          filter: [
-            {
-              type: "equals",
-              field: "salesChannelId",
-              value: uuid
-            },
-            {
-              type: "equals",
-              field: "configurationKey",
-              value: "storefront.themeSeed"
-            }
-          ]
-        }
-      });
-      const currentConfig = await response.json();
-      const themeSeed = currentConfig.total > 0 ? currentConfig.data[0].configurationValue : null;
       await AdminApiContext.delete(`./customer/${customerUuid}`);
       const ordersResp = await AdminApiContext.post(`./search/order`, {
         data: {
@@ -313,7 +305,6 @@ const test$a = test$c.extend({
           }
         }
       }
-      await AdminApiContext.delete(`./sales-channel/${uuid}`);
       const syncResp = await AdminApiContext.post("./_action/sync", {
         data: {
           "write-sales-channel": {
@@ -360,16 +351,6 @@ const test$a = test$c.extend({
         }
       });
       expect(syncResp.ok()).toBeTruthy();
-      if (themeSeed) {
-        await AdminApiContext.post("./system-config", {
-          data: {
-            id: uuid,
-            salesChannelId: uuid,
-            configurationKey: "storefront.themeSeed",
-            configurationValue: themeSeed
-          }
-        });
-      }
       const salesChannelPromise = AdminApiContext.get(`./sales-channel/${uuid}`);
       const salutationResponse = await AdminApiContext.get(`./salutation`);
       const salutations = await salutationResponse.json();
@@ -418,8 +399,7 @@ const test$a = test$c.extend({
       await use({
         salesChannel: salesChannel.data,
         customer: { ...customer.data, password: customerData.password },
-        url: baseUrl,
-        themeSeed
+        url: baseUrl
       });
     },
     { scope: "worker" }
@@ -428,26 +408,19 @@ const test$a = test$c.extend({
     async ({ browser, AdminApiContext, DefaultSalesChannel, SalesChannelBaseConfig }, use) => {
       const { id: uuid } = DefaultSalesChannel.salesChannel;
       const isSaasInstance = await isSaaSInstance(AdminApiContext);
-      await AdminApiContext.post(
-        `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${uuid}`
-      );
-      test$c.slow();
-      if (isSaasInstance) {
-        const tmpContext = await browser.newContext();
-        const tmpPage = await tmpContext.newPage();
-        for (let i = 0; i < 100; ++i) {
-          let latestTimestamp = (/* @__PURE__ */ new Date()).toISOString();
-          const response = await AdminApiContext.get(`./notification/message?limit=10&latestTimestamp=${latestTimestamp}`);
-          const json = await response.json();
-          if (json.timestamp) {
-            latestTimestamp = json.timestamp;
-          }
-          if (json.notifications.find((n) => n.message.includes(`Compilation for sales channel ${DefaultSalesChannel.salesChannel.name} completed`))) {
-            tmpPage.close();
-            tmpContext.close();
-            break;
+      const tmpContext = await browser.newContext({
+        baseURL: DefaultSalesChannel.url
+      });
+      const tmpPage = await tmpContext.newPage();
+      if (!await isThemeCompiled(tmpPage)) {
+        test$c.slow();
+        await AdminApiContext.post(
+          `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${uuid}`
+        );
+        if (isSaasInstance) {
+          while (!await isThemeCompiled(tmpPage)) {
+            await tmpPage.waitForTimeout(2e3);
           }
-          await tmpPage.waitForTimeout(1e3);
         }
       }
       await use({
@@ -3599,4 +3572,4 @@ const test = mergeTests(
   test$1
 );
 
-export { AdminPageObjects, StorefrontPageObjects, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, setOrderStatus, test };
+export { AdminPageObjects, StorefrontPageObjects, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/acceptance-test-suite",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Shopware Acceptance Test Suite",
   "author": "shopware AG",
   "license": "MIT",