@shopware-ag/acceptance-test-suite 2.3.1 → 2.3.2

package/dist/index.d.mts

@@ -2,7 +2,6 @@ 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';
 
@@ -529,7 +528,7 @@ interface TestDataFixtureTypes {
 
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
-    SaaSInstanceSetup: () => Promise<void>;
+    SaaSInstanceSetup: (page: Page) => Promise<void>;
 }
 
 interface StoreBaseConfig {
@@ -1020,7 +1019,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 const isThemeCompiled: (context: AdminApiContext, storefrontUrl: string) => Promise<boolean>;
 
 declare function createRandomImage(width?: number, height?: number): Image;
 

package/dist/index.d.ts

@@ -2,7 +2,6 @@ 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';
 
@@ -529,7 +528,7 @@ interface TestDataFixtureTypes {
 
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
-    SaaSInstanceSetup: () => Promise<void>;
+    SaaSInstanceSetup: (page: Page) => Promise<void>;
 }
 
 interface StoreBaseConfig {
@@ -1020,7 +1019,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 const isThemeCompiled: (context: AdminApiContext, storefrontUrl: string) => Promise<boolean>;
 
 declare function createRandomImage(width?: number, height?: number): Image;
 

package/dist/index.mjs

@@ -200,23 +200,6 @@ const setOrderStatus = async (orderId, orderStatus, adminApiContext) => {
   return await adminApiContext.post(`./_action/order/${orderId}/state/${orderStatus}`);
 };
 
-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$b = test$d.extend({
   SalesChannelBaseConfig: [
     async ({ AdminApiContext }, use) => {
@@ -403,31 +386,6 @@ const test$b = test$d.extend({
       });
     },
     { scope: "worker" }
-  ],
-  DefaultStorefront: [
-    async ({ browser, AdminApiContext, DefaultSalesChannel, SalesChannelBaseConfig }, use) => {
-      const { id: uuid } = DefaultSalesChannel.salesChannel;
-      const isSaasInstance = await isSaaSInstance(AdminApiContext);
-      const tmpContext = await browser.newContext({
-        baseURL: DefaultSalesChannel.url
-      });
-      const tmpPage = await tmpContext.newPage();
-      if (!await isThemeCompiled(tmpPage)) {
-        test$d.slow();
-        await AdminApiContext.post(
-          `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${uuid}`
-        );
-        if (isSaasInstance) {
-          while (!await isThemeCompiled(tmpPage)) {
-            await tmpPage.waitForTimeout(2e3);
-          }
-        }
-      }
-      await use({
-        ...DefaultSalesChannel
-      });
-    },
-    { scope: "worker" }
   ]
 });
 
@@ -671,6 +629,22 @@ async function mockApiCalls(page) {
   }));
 }
 
+const isSaaSInstance = async (adminApiContext) => {
+  const instanceFeatures = await adminApiContext.get("./instance/features");
+  return instanceFeatures.ok();
+};
+const isThemeCompiled = async (context, storefrontUrl) => {
+  const response = await context.get(storefrontUrl);
+  const body = (await response.body()).toString();
+  const matches = body.match(/.*"(https:\/\/.*all\.css[^"]*)".*/);
+  if (matches && matches?.length > 1) {
+    const allCssUrl = matches[1];
+    const allCssResponse = await context.get(allCssUrl);
+    return allCssResponse.status() < 400;
+  }
+  return false;
+};
+
 const test$9 = test$d.extend({
   AdminPage: async ({ IdProvider, AdminApiContext, SalesChannelBaseConfig, browser }, use) => {
     const context = await browser.newContext({
@@ -721,15 +695,26 @@ const test$9 = test$d.extend({
     await use(page);
     await page.close();
     await context.close();
-    const cleanupResponse = await AdminApiContext.delete(`user/${uuid}`);
-    expect(cleanupResponse.ok()).toBeTruthy();
+    await AdminApiContext.delete(`user/${uuid}`);
   },
-  StorefrontPage: async ({ DefaultStorefront, browser }, use) => {
-    const { url } = DefaultStorefront;
+  StorefrontPage: async ({ DefaultSalesChannel, SalesChannelBaseConfig, browser, AdminApiContext }, use) => {
+    const { url, salesChannel } = DefaultSalesChannel;
     const context = await browser.newContext({
       baseURL: url
     });
     const page = await context.newPage();
+    const isSaasInstance = await isSaaSInstance(AdminApiContext);
+    if (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
+      test$d.slow();
+      await AdminApiContext.post(
+        `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${salesChannel.id}`
+      );
+      if (isSaasInstance) {
+        while (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
+          await page.waitForTimeout(4e3);
+        }
+      }
+    }
     await page.goto("./", { waitUntil: "load" });
     await use(page);
     await page.close();
@@ -1856,15 +1841,14 @@ const test$6 = test$d.extend({
     { scope: "worker" }
   ],
   SaaSInstanceSetup: [
-    async ({ AdminApiContext, browser }, use) => {
-      const SetupInstance = async function SetupInstance2() {
+    async ({ AdminApiContext }, use) => {
+      const SetupInstance = async function SetupInstance2(page) {
         await test$6.skip(!await isSaaSInstance(AdminApiContext), "Skipping SaaS setup, could not detect SaaS instance");
         const instanceStatusResponse = await AdminApiContext.get("./instance/status");
         const instanceStatus = await instanceStatusResponse.json();
         await expect(instanceStatus.tags, 'expect instance to have "ci" tag').toContain("ci");
         await test$6.skip((await AdminApiContext.get(`${process.env.APP_URL}constructionmode`, { maxRedirects: 0 })).status() > 204, "Instance already setup");
-        const page = await browser.newPage({ baseURL: process.env.ADMIN_URL });
-        await page.goto("./set-up-shop");
+        await page.goto(`${process.env.ADMIN_URL}set-up-shop`);
         await page.getByRole("button", { name: "Next" }).click();
         await expect(page.getByRole("heading", { name: "Everything finished!" })).toBeVisible();
         await page.getByRole("button", { name: "Open your shop" }).click();
@@ -1873,6 +1857,7 @@ const test$6 = test$d.extend({
         await page.getByLabel("Password").fill(AdminApiContext.options.admin_password ?? "shopware");
         await page.getByRole("button", { name: "Log in" }).click();
         await page.getByRole("button", { name: "Launch your business" }).click();
+        await expect(page.getByRole("button", { name: "Launch your business" })).toBeHidden();
       };
       await use(SetupInstance);
     },

package/package.json

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