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

package/dist/index.d.mts

@@ -71,6 +71,31 @@ declare class StoreApiContext {
     head<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
 }
 
+interface ApiContextTypes {
+    AdminApiContext: AdminApiContext;
+    StoreApiContext: StoreApiContext;
+}
+
+interface PageContextTypes {
+    AdminPage: Page;
+    StorefrontPage: Page;
+}
+
+declare class Actor {
+    page: Page;
+    readonly name: string;
+    constructor(name: string, page: Page);
+    expects: _playwright_test.Expect<{}>;
+    attemptsTo(task: () => Promise<void>): Promise<void>;
+    goesTo(url: string): Promise<void>;
+    private camelCaseToLowerCase;
+}
+
+interface ActorFixtureTypes {
+    ShopCustomer: Actor;
+    ShopAdmin: Actor;
+}
+
 interface IdPair {
     id: string;
     uuid: string;
@@ -169,7 +194,7 @@ type Promotion = components['schemas']['Promotion'] & {
 
 interface CreatedRecord {
     resource: string;
-    id: string;
+    payload: Record<string, string>;
 }
 interface SimpleLineItem {
     product: Product;
@@ -204,7 +229,25 @@ declare class TestDataService {
     readonly defaultLanguageId: string;
     readonly defaultCountryId: string;
     readonly defaultCustomerGroupId: string;
+    /**
+     * Configures if an automated cleanup of the data should be executed.
+     *
+     * @private
+     */
     private shouldCleanUp;
+    /**
+     * Configuration of higher priority entities for the cleanup operation.
+     * These entities will be deleted before others.
+     * This will prevent restricted delete operations of associated entities.
+     *
+     * @private
+     */
+    private highPriorityEntities;
+    /**
+     * A registry of all created records.
+     *
+     * @private
+     */
     private createdRecords;
     constructor(AdminApiClient: AdminApiContext, IdProvider: IdProvider, options: DataServiceOptions);
     /**
@@ -405,9 +448,9 @@ declare class TestDataService {
      * All entities added to the registry will be deleted by the cleanup call.
      *
      * @param resource - The resource name of the entity.
-     * @param id - The uuid of the entity.
+     * @param payload - You can pass a payload object for the delete operation or simply pass the uuid of the entity.
      */
-    addCreatedRecord(resource: string, id: string): void;
+    addCreatedRecord(resource: string, payload: string | Record<string, string>): void;
     /**
      * Set the configuration of automated data clean up.
      * If set to "true" the data service will delete all entities created by it.
@@ -480,32 +523,10 @@ declare class TestDataService {
     getBasicPromotionStruct(salesChannelId?: string, overrides?: Partial<Promotion>): Partial<Promotion>;
 }
 
-interface ApiContextTypes {
-    AdminApiContext: AdminApiContext;
-    StoreApiContext: StoreApiContext;
+interface TestDataFixtureTypes {
     TestDataService: TestDataService;
 }
 
-interface PageContextTypes {
-    AdminPage: Page;
-    StorefrontPage: Page;
-}
-
-declare class Actor {
-    page: Page;
-    readonly name: string;
-    constructor(name: string, page: Page);
-    expects: _playwright_test.Expect<{}>;
-    attemptsTo(task: () => Promise<void>): Promise<void>;
-    goesTo(url: string): Promise<void>;
-    private camelCaseToLowerCase;
-}
-
-interface ActorFixtureTypes {
-    ShopCustomer: Actor;
-    ShopAdmin: Actor;
-}
-
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
     SaaSInstanceSetup: () => Promise<void>;
@@ -972,7 +993,7 @@ interface DataFixtureTypes {
     TagData: components['schemas']['Tag'];
 }
 
-interface FixtureTypes extends ApiContextTypes, PageContextTypes, ActorFixtureTypes, HelperFixtureTypes, DefaultSalesChannelTypes, StorefrontPageTypes, AdministrationPageTypes, DataFixtureTypes {
+interface FixtureTypes extends ApiContextTypes, PageContextTypes, ActorFixtureTypes, TestDataFixtureTypes, HelperFixtureTypes, DefaultSalesChannelTypes, StorefrontPageTypes, AdministrationPageTypes, DataFixtureTypes {
 }
 
 declare const getLanguageData: (languageCode: string, adminApiContext: AdminApiContext) => Promise<{

package/dist/index.d.ts

@@ -71,6 +71,31 @@ declare class StoreApiContext {
     head<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
 }
 
+interface ApiContextTypes {
+    AdminApiContext: AdminApiContext;
+    StoreApiContext: StoreApiContext;
+}
+
+interface PageContextTypes {
+    AdminPage: Page;
+    StorefrontPage: Page;
+}
+
+declare class Actor {
+    page: Page;
+    readonly name: string;
+    constructor(name: string, page: Page);
+    expects: _playwright_test.Expect<{}>;
+    attemptsTo(task: () => Promise<void>): Promise<void>;
+    goesTo(url: string): Promise<void>;
+    private camelCaseToLowerCase;
+}
+
+interface ActorFixtureTypes {
+    ShopCustomer: Actor;
+    ShopAdmin: Actor;
+}
+
 interface IdPair {
     id: string;
     uuid: string;
@@ -169,7 +194,7 @@ type Promotion = components['schemas']['Promotion'] & {
 
 interface CreatedRecord {
     resource: string;
-    id: string;
+    payload: Record<string, string>;
 }
 interface SimpleLineItem {
     product: Product;
@@ -204,7 +229,25 @@ declare class TestDataService {
     readonly defaultLanguageId: string;
     readonly defaultCountryId: string;
     readonly defaultCustomerGroupId: string;
+    /**
+     * Configures if an automated cleanup of the data should be executed.
+     *
+     * @private
+     */
     private shouldCleanUp;
+    /**
+     * Configuration of higher priority entities for the cleanup operation.
+     * These entities will be deleted before others.
+     * This will prevent restricted delete operations of associated entities.
+     *
+     * @private
+     */
+    private highPriorityEntities;
+    /**
+     * A registry of all created records.
+     *
+     * @private
+     */
     private createdRecords;
     constructor(AdminApiClient: AdminApiContext, IdProvider: IdProvider, options: DataServiceOptions);
     /**
@@ -405,9 +448,9 @@ declare class TestDataService {
      * All entities added to the registry will be deleted by the cleanup call.
      *
      * @param resource - The resource name of the entity.
-     * @param id - The uuid of the entity.
+     * @param payload - You can pass a payload object for the delete operation or simply pass the uuid of the entity.
      */
-    addCreatedRecord(resource: string, id: string): void;
+    addCreatedRecord(resource: string, payload: string | Record<string, string>): void;
     /**
      * Set the configuration of automated data clean up.
      * If set to "true" the data service will delete all entities created by it.
@@ -480,32 +523,10 @@ declare class TestDataService {
     getBasicPromotionStruct(salesChannelId?: string, overrides?: Partial<Promotion>): Partial<Promotion>;
 }
 
-interface ApiContextTypes {
-    AdminApiContext: AdminApiContext;
-    StoreApiContext: StoreApiContext;
+interface TestDataFixtureTypes {
     TestDataService: TestDataService;
 }
 
-interface PageContextTypes {
-    AdminPage: Page;
-    StorefrontPage: Page;
-}
-
-declare class Actor {
-    page: Page;
-    readonly name: string;
-    constructor(name: string, page: Page);
-    expects: _playwright_test.Expect<{}>;
-    attemptsTo(task: () => Promise<void>): Promise<void>;
-    goesTo(url: string): Promise<void>;
-    private camelCaseToLowerCase;
-}
-
-interface ActorFixtureTypes {
-    ShopCustomer: Actor;
-    ShopAdmin: Actor;
-}
-
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
     SaaSInstanceSetup: () => Promise<void>;
@@ -972,7 +993,7 @@ interface DataFixtureTypes {
     TagData: components['schemas']['Tag'];
 }
 
-interface FixtureTypes extends ApiContextTypes, PageContextTypes, ActorFixtureTypes, HelperFixtureTypes, DefaultSalesChannelTypes, StorefrontPageTypes, AdministrationPageTypes, DataFixtureTypes {
+interface FixtureTypes extends ApiContextTypes, PageContextTypes, ActorFixtureTypes, TestDataFixtureTypes, HelperFixtureTypes, DefaultSalesChannelTypes, StorefrontPageTypes, AdministrationPageTypes, DataFixtureTypes {
 }
 
 declare const getLanguageData: (languageCode: string, adminApiContext: AdminApiContext) => Promise<{

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { test as test$c, expect, request, mergeTests } from '@playwright/test';
+import { test as test$d, expect, request, mergeTests } from '@playwright/test';
 export * from '@playwright/test';
 import { Image } from 'image-js';
 import crypto from 'crypto';
@@ -217,7 +217,7 @@ const isThemeCompiled = async (page) => {
   return allCSSFound;
 };
 
-const test$a = test$c.extend({
+const test$b = test$d.extend({
   SalesChannelBaseConfig: [
     async ({ AdminApiContext }, use) => {
       const requests = {
@@ -413,7 +413,7 @@ const test$a = test$c.extend({
       });
       const tmpPage = await tmpContext.newPage();
       if (!await isThemeCompiled(tmpPage)) {
-        test$c.slow();
+        test$d.slow();
         await AdminApiContext.post(
           `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${uuid}`
         );
@@ -616,6 +616,177 @@ __publicField$r(_StoreApiContext, "defaultOptions", {
 });
 let StoreApiContext = _StoreApiContext;
 
+const test$a = test$d.extend({
+  AdminApiContext: [
+    async ({}, use) => {
+      const adminApiContext = await AdminApiContext.create();
+      await use(adminApiContext);
+    },
+    { scope: "worker" }
+  ],
+  StoreApiContext: [
+    async ({ DefaultSalesChannel }, use) => {
+      const options = {
+        app_url: process.env["APP_URL"],
+        "sw-access-key": DefaultSalesChannel.salesChannel.accessKey,
+        ignoreHTTPSErrors: true
+      };
+      const storeApiContext = await StoreApiContext.create(options);
+      await use(storeApiContext);
+    },
+    { scope: "worker" }
+  ]
+});
+
+async function mockApiCalls(page) {
+  await page.route("**/api/notification/message*", (route) => route.fulfill({
+    status: 200,
+    contentType: "application/json",
+    body: JSON.stringify({ notifications: [], timestamp: "2024-06-19 06:23:25.040" })
+  }));
+  await page.route("**/api/_action/store/plugin/search*", (route) => route.fulfill({
+    status: 200,
+    contentType: "application/json",
+    body: JSON.stringify({ items: [], total: 0 })
+  }));
+  await page.route("**/api/_action/store/updates*", (route) => route.fulfill({
+    status: 200,
+    contentType: "application/json",
+    body: JSON.stringify({ items: [], total: 0 })
+  }));
+  await page.route("**/api/sbp/shop-info*", (route) => route.fulfill({
+    status: 200,
+    contentType: "application/json",
+    body: JSON.stringify({ items: [], total: 0 })
+  }));
+  await page.route("**/api/sbp/shop-info*", (route) => route.fulfill({
+    status: 200,
+    contentType: "application/json",
+    body: process.env.SBP_SHOP_INFO_JSON ?? "{}"
+  }));
+  await page.route("**/api/sbp/bookableplans*", (route) => route.fulfill({
+    status: 200,
+    contentType: "application/json",
+    body: process.env.SBP_BOOKABLE_PLANS_JSON ?? "{}"
+  }));
+}
+
+const test$9 = test$d.extend({
+  AdminPage: async ({ IdProvider, AdminApiContext, SalesChannelBaseConfig, browser }, use) => {
+    const context = await browser.newContext({
+      baseURL: SalesChannelBaseConfig.adminUrl,
+      serviceWorkers: "block"
+    });
+    const page = await context.newPage();
+    await mockApiCalls(page);
+    const { id, uuid } = IdProvider.getIdPair();
+    const adminUser = {
+      id: uuid,
+      username: `admin_${id}`,
+      firstName: `${id} admin`,
+      lastName: `${id} admin`,
+      localeId: SalesChannelBaseConfig.enGBLocaleId,
+      email: `admin_${id}@example.com`,
+      timezone: "Europe/Berlin",
+      password: "shopware",
+      admin: true
+    };
+    const response = await AdminApiContext.post("user", {
+      data: adminUser
+    });
+    expect(response.ok()).toBeTruthy();
+    await page.goto("#/login");
+    await page.addStyleTag({
+      content: `
+                .sf-toolbar {
+                    width: 0 !important;
+                    height: 0 !important;
+                    display: none !important;
+                    pointer-events: none !important;
+                }
+                `.trim()
+    });
+    await page.getByLabel(/Username|Email address/).fill(adminUser.username);
+    await page.getByLabel("Password").fill(adminUser.password);
+    await page.getByRole("button", { name: "Log in" }).click();
+    await expect(page.locator("css=.sw-admin-menu__header-logo").first()).toBeVisible({
+      timeout: 2e4
+    });
+    await expect(page.locator(".sw-skeleton")).toHaveCount(0, {
+      timeout: 1e4
+    });
+    await expect(page.locator(".sw-loader")).toHaveCount(0, {
+      timeout: 1e4
+    });
+    await use(page);
+    await page.close();
+    await context.close();
+    const cleanupResponse = await AdminApiContext.delete(`user/${uuid}`);
+    expect(cleanupResponse.ok()).toBeTruthy();
+  },
+  StorefrontPage: async ({ DefaultStorefront, browser }, use) => {
+    const { url } = DefaultStorefront;
+    const context = await browser.newContext({
+      baseURL: url
+    });
+    const page = await context.newPage();
+    await page.goto("./", { waitUntil: "load" });
+    await use(page);
+    await page.close();
+    await context.close();
+  }
+});
+
+var __defProp$q = Object.defineProperty;
+var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$q = (obj, key, value) => {
+  __defNormalProp$q(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class Actor {
+  constructor(name, page) {
+    __publicField$q(this, "page");
+    __publicField$q(this, "name");
+    __publicField$q(this, "expects", expect);
+    this.name = name;
+    this.page = page;
+  }
+  async attemptsTo(task) {
+    const stepTitle = `${this.name} attempts to ${this.camelCaseToLowerCase(task.name)}`;
+    await test$d.step(stepTitle, async () => await task());
+  }
+  async goesTo(url) {
+    const stepTitle = `${this.name} navigates to "${url}"`;
+    await test$d.step(stepTitle, async () => {
+      await this.page.goto(url);
+      await this.page.addStyleTag({
+        content: `
+                .sf-toolbar {
+                    width: 0 !important;
+                    height: 0 !important;
+                    display: none !important;
+                    pointer-events: none !important;
+                }
+                `.trim()
+      });
+    });
+  }
+  camelCaseToLowerCase(str) {
+    return str.replace(/[A-Z]/g, (letter) => ` ${letter.toLowerCase()}`);
+  }
+}
+
+const test$8 = test$d.extend({
+  ShopCustomer: async ({ StorefrontPage }, use) => {
+    const shopCustomer = new Actor("Shop customer", StorefrontPage);
+    await use(shopCustomer);
+  },
+  ShopAdmin: async ({ AdminPage }, use) => {
+    const shopAdmin = new Actor("Shop administrator", AdminPage);
+    await use(shopAdmin);
+  }
+});
+
 function createRandomImage(width = 800, height = 600) {
   const buffer = Buffer.alloc(width * height * 4);
   let i = 0;
@@ -625,27 +796,45 @@ function createRandomImage(width = 800, height = 600) {
   return new Image(width, height, buffer);
 }
 
-var __defProp$q = Object.defineProperty;
-var __defNormalProp$q = (obj, key, value) => key in obj ? __defProp$q(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$q = (obj, key, value) => {
-  __defNormalProp$q(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __defProp$p = Object.defineProperty;
+var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField$p = (obj, key, value) => {
+  __defNormalProp$p(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
 class TestDataService {
   constructor(AdminApiClient, IdProvider, options) {
-    __publicField$q(this, "AdminApiClient");
-    __publicField$q(this, "IdProvider");
-    __publicField$q(this, "namePrefix", "Test-");
-    __publicField$q(this, "nameSuffix", "");
-    __publicField$q(this, "defaultSalesChannel");
-    __publicField$q(this, "defaultTaxId");
-    __publicField$q(this, "defaultCurrencyId");
-    __publicField$q(this, "defaultCategoryId");
-    __publicField$q(this, "defaultLanguageId");
-    __publicField$q(this, "defaultCountryId");
-    __publicField$q(this, "defaultCustomerGroupId");
-    __publicField$q(this, "shouldCleanUp", true);
-    __publicField$q(this, "createdRecords", []);
+    __publicField$p(this, "AdminApiClient");
+    __publicField$p(this, "IdProvider");
+    __publicField$p(this, "namePrefix", "Test-");
+    __publicField$p(this, "nameSuffix", "");
+    __publicField$p(this, "defaultSalesChannel");
+    __publicField$p(this, "defaultTaxId");
+    __publicField$p(this, "defaultCurrencyId");
+    __publicField$p(this, "defaultCategoryId");
+    __publicField$p(this, "defaultLanguageId");
+    __publicField$p(this, "defaultCountryId");
+    __publicField$p(this, "defaultCustomerGroupId");
+    /**
+     * Configures if an automated cleanup of the data should be executed.
+     *
+     * @private
+     */
+    __publicField$p(this, "shouldCleanUp", true);
+    /**
+     * Configuration of higher priority entities for the cleanup operation.
+     * These entities will be deleted before others.
+     * This will prevent restricted delete operations of associated entities.
+     *
+     * @private
+     */
+    __publicField$p(this, "highPriorityEntities", ["order", "product"]);
+    /**
+     * A registry of all created records.
+     *
+     * @private
+     */
+    __publicField$p(this, "createdRecords", []);
     this.AdminApiClient = AdminApiClient;
     this.IdProvider = IdProvider;
     this.defaultSalesChannel = options.defaultSalesChannel;
@@ -711,8 +900,7 @@ class TestDataService {
   async createDigitalProduct(content = "Lorem ipsum dolor", overrides = {}, taxId = this.defaultTaxId, currencyId = this.defaultCurrencyId) {
     const product = await this.createBasicProduct(overrides, taxId, currencyId);
     const media = await this.createMediaTXT(content);
-    const productDownload = await this.assignProductDownload(product.id, media.id);
-    this.addCreatedRecord("product-download", productDownload.id);
+    await this.assignProductDownload(product.id, media.id);
     return product;
   }
   /**
@@ -822,7 +1010,7 @@ class TestDataService {
       data: Object.assign({}, colorPropertyGroup, overrides)
     });
     const { data: propertyGroup } = await propertyGroupResponse.json();
-    this.addCreatedRecord("property-group", propertyGroup.id);
+    this.addCreatedRecord("property_group", propertyGroup.id);
     return propertyGroup;
   }
   /**
@@ -849,7 +1037,7 @@ class TestDataService {
       data: Object.assign({}, textPropertyGroup, overrides)
     });
     const { data: propertyGroup } = await propertyGroupResponse.json();
-    this.addCreatedRecord("property-group", propertyGroup.id);
+    this.addCreatedRecord("property_group", propertyGroup.id);
     return propertyGroup;
   }
   /**
@@ -1190,10 +1378,18 @@ class TestDataService {
    * All entities added to the registry will be deleted by the cleanup call.
    *
    * @param resource - The resource name of the entity.
-   * @param id - The uuid of the entity.
+   * @param payload - You can pass a payload object for the delete operation or simply pass the uuid of the entity.
    */
-  addCreatedRecord(resource, id) {
-    this.createdRecords.push({ resource, id });
+  addCreatedRecord(resource, payload) {
+    const res = resource.replace("-", "_");
+    if (typeof payload === "string") {
+      this.createdRecords.push({
+        resource: res,
+        payload: { id: payload }
+      });
+    } else {
+      this.createdRecords.push({ resource: res, payload });
+    }
   }
   /**
    * Set the configuration of automated data clean up.
@@ -1211,16 +1407,31 @@ class TestDataService {
     if (!this.shouldCleanUp) {
       return Promise.reject();
     }
+    const priorityDeleteOperations = {};
     const deleteOperations = {};
     this.createdRecords.forEach((record) => {
-      if (!deleteOperations[`delete-${record.resource}`]) {
-        deleteOperations[`delete-${record.resource}`] = {
-          entity: record.resource,
-          action: "delete",
-          payload: []
-        };
+      if (this.highPriorityEntities.includes(record.resource)) {
+        if (!priorityDeleteOperations[`delete-${record.resource}`]) {
+          priorityDeleteOperations[`delete-${record.resource}`] = {
+            entity: record.resource,
+            action: "delete",
+            payload: []
+          };
+        }
+        priorityDeleteOperations[`delete-${record.resource}`].payload.push(record.payload);
+      } else {
+        if (!deleteOperations[`delete-${record.resource}`]) {
+          deleteOperations[`delete-${record.resource}`] = {
+            entity: record.resource,
+            action: "delete",
+            payload: []
+          };
+        }
+        deleteOperations[`delete-${record.resource}`].payload.push(record.payload);
       }
-      deleteOperations[`delete-${record.resource}`].payload.push({ id: record.id });
+    });
+    await this.AdminApiClient.post("_action/sync", {
+      data: priorityDeleteOperations
     });
     return await this.AdminApiClient.post("_action/sync", {
       data: deleteOperations
@@ -1581,190 +1792,19 @@ class TestDataService {
   }
 }
 
-const test$9 = test$c.extend({
-  AdminApiContext: [
-    async ({}, use) => {
-      const adminApiContext = await AdminApiContext.create();
-      await use(adminApiContext);
-    },
-    { scope: "worker" }
-  ],
-  StoreApiContext: [
-    async ({ DefaultSalesChannel }, use) => {
-      const options = {
-        app_url: process.env["APP_URL"],
-        "sw-access-key": DefaultSalesChannel.salesChannel.accessKey,
-        ignoreHTTPSErrors: true
-      };
-      const storeApiContext = await StoreApiContext.create(options);
-      await use(storeApiContext);
-    },
-    { scope: "worker" }
-  ],
-  TestDataService: [
-    async ({ AdminApiContext: AdminApiContext2, IdProvider, DefaultSalesChannel, SalesChannelBaseConfig }, use) => {
-      const DataService = new TestDataService(AdminApiContext2, IdProvider, {
-        defaultSalesChannel: DefaultSalesChannel.salesChannel,
-        defaultTaxId: SalesChannelBaseConfig.taxId,
-        defaultCurrencyId: SalesChannelBaseConfig.defaultCurrencyId,
-        defaultCategoryId: DefaultSalesChannel.salesChannel.navigationCategoryId,
-        defaultLanguageId: DefaultSalesChannel.salesChannel.languageId,
-        defaultCountryId: DefaultSalesChannel.salesChannel.countryId,
-        defaultCustomerGroupId: DefaultSalesChannel.salesChannel.customerGroupId
-      });
-      await use(DataService);
-      await DataService.cleanUp();
-    },
-    { scope: "worker" }
-  ]
-});
-
-async function mockApiCalls(page) {
-  await page.route("**/api/notification/message*", (route) => route.fulfill({
-    status: 200,
-    contentType: "application/json",
-    body: JSON.stringify({ notifications: [], timestamp: "2024-06-19 06:23:25.040" })
-  }));
-  await page.route("**/api/_action/store/plugin/search*", (route) => route.fulfill({
-    status: 200,
-    contentType: "application/json",
-    body: JSON.stringify({ items: [], total: 0 })
-  }));
-  await page.route("**/api/_action/store/updates*", (route) => route.fulfill({
-    status: 200,
-    contentType: "application/json",
-    body: JSON.stringify({ items: [], total: 0 })
-  }));
-  await page.route("**/api/sbp/shop-info*", (route) => route.fulfill({
-    status: 200,
-    contentType: "application/json",
-    body: JSON.stringify({ items: [], total: 0 })
-  }));
-  await page.route("**/api/sbp/shop-info*", (route) => route.fulfill({
-    status: 200,
-    contentType: "application/json",
-    body: process.env.SBP_SHOP_INFO_JSON ?? "{}"
-  }));
-  await page.route("**/api/sbp/bookableplans*", (route) => route.fulfill({
-    status: 200,
-    contentType: "application/json",
-    body: process.env.SBP_BOOKABLE_PLANS_JSON ?? "{}"
-  }));
-}
-
-const test$8 = test$c.extend({
-  AdminPage: async ({ IdProvider, AdminApiContext, SalesChannelBaseConfig, browser }, use) => {
-    const context = await browser.newContext({
-      baseURL: SalesChannelBaseConfig.adminUrl,
-      serviceWorkers: "block"
-    });
-    const page = await context.newPage();
-    await mockApiCalls(page);
-    const { id, uuid } = IdProvider.getIdPair();
-    const adminUser = {
-      id: uuid,
-      username: `admin_${id}`,
-      firstName: `${id} admin`,
-      lastName: `${id} admin`,
-      localeId: SalesChannelBaseConfig.enGBLocaleId,
-      email: `admin_${id}@example.com`,
-      timezone: "Europe/Berlin",
-      password: "shopware",
-      admin: true
-    };
-    const response = await AdminApiContext.post("user", {
-      data: adminUser
-    });
-    expect(response.ok()).toBeTruthy();
-    await page.goto("#/login");
-    await page.addStyleTag({
-      content: `
-                .sf-toolbar {
-                    width: 0 !important;
-                    height: 0 !important;
-                    display: none !important;
-                    pointer-events: none !important;
-                }
-                `.trim()
-    });
-    await page.getByLabel(/Username|Email address/).fill(adminUser.username);
-    await page.getByLabel("Password").fill(adminUser.password);
-    await page.getByRole("button", { name: "Log in" }).click();
-    await expect(page.locator("css=.sw-admin-menu__header-logo").first()).toBeVisible({
-      timeout: 2e4
-    });
-    await expect(page.locator(".sw-skeleton")).toHaveCount(0, {
-      timeout: 1e4
-    });
-    await expect(page.locator(".sw-loader")).toHaveCount(0, {
-      timeout: 1e4
-    });
-    await use(page);
-    await page.close();
-    await context.close();
-    const cleanupResponse = await AdminApiContext.delete(`user/${uuid}`);
-    expect(cleanupResponse.ok()).toBeTruthy();
-  },
-  StorefrontPage: async ({ DefaultStorefront, browser }, use) => {
-    const { url } = DefaultStorefront;
-    const context = await browser.newContext({
-      baseURL: url
-    });
-    const page = await context.newPage();
-    await page.goto("./", { waitUntil: "load" });
-    await use(page);
-    await page.close();
-    await context.close();
-  }
-});
-
-var __defProp$p = Object.defineProperty;
-var __defNormalProp$p = (obj, key, value) => key in obj ? __defProp$p(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField$p = (obj, key, value) => {
-  __defNormalProp$p(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-class Actor {
-  constructor(name, page) {
-    __publicField$p(this, "page");
-    __publicField$p(this, "name");
-    __publicField$p(this, "expects", expect);
-    this.name = name;
-    this.page = page;
-  }
-  async attemptsTo(task) {
-    const stepTitle = `${this.name} attempts to ${this.camelCaseToLowerCase(task.name)}`;
-    await test$c.step(stepTitle, async () => await task());
-  }
-  async goesTo(url) {
-    const stepTitle = `${this.name} navigates to "${url}"`;
-    await test$c.step(stepTitle, async () => {
-      await this.page.goto(url);
-      await this.page.addStyleTag({
-        content: `
-                .sf-toolbar {
-                    width: 0 !important;
-                    height: 0 !important;
-                    display: none !important;
-                    pointer-events: none !important;
-                }
-                `.trim()
-      });
+const test$7 = test$d.extend({
+  TestDataService: async ({ AdminApiContext, IdProvider, DefaultSalesChannel, SalesChannelBaseConfig }, use) => {
+    const DataService = new TestDataService(AdminApiContext, IdProvider, {
+      defaultSalesChannel: DefaultSalesChannel.salesChannel,
+      defaultTaxId: SalesChannelBaseConfig.taxId,
+      defaultCurrencyId: SalesChannelBaseConfig.defaultCurrencyId,
+      defaultCategoryId: DefaultSalesChannel.salesChannel.navigationCategoryId,
+      defaultLanguageId: DefaultSalesChannel.salesChannel.languageId,
+      defaultCountryId: DefaultSalesChannel.salesChannel.countryId,
+      defaultCustomerGroupId: DefaultSalesChannel.salesChannel.customerGroupId
     });
-  }
-  camelCaseToLowerCase(str) {
-    return str.replace(/[A-Z]/g, (letter) => ` ${letter.toLowerCase()}`);
-  }
-}
-
-const test$7 = test$c.extend({
-  ShopCustomer: async ({ StorefrontPage }, use) => {
-    const shopCustomer = new Actor("Shop customer", StorefrontPage);
-    await use(shopCustomer);
-  },
-  ShopAdmin: async ({ AdminPage }, use) => {
-    const shopAdmin = new Actor("Shop administrator", AdminPage);
-    await use(shopAdmin);
+    await use(DataService);
+    await DataService.cleanUp();
   }
 });
 
@@ -1806,7 +1846,7 @@ class IdProvider {
   }
 }
 
-const test$6 = test$c.extend({
+const test$6 = test$d.extend({
   IdProvider: [
     async ({}, use, workerInfo) => {
       const seed = process.env.SHOPWARE_ACCESS_KEY_ID || process.env.SHOPWARE_ADMIN_PASSWORD || "test-suite";
@@ -2291,7 +2331,7 @@ const StorefrontPageObjects = {
   Search,
   SearchSuggest
 };
-const test$5 = test$c.extend({
+const test$5 = test$d.extend({
   StorefrontHome: async ({ StorefrontPage }, use) => {
     await use(new Home(StorefrontPage));
   },
@@ -2684,7 +2724,7 @@ const AdminPageObjects = {
   Dashboard,
   DataSharing
 };
-const test$4 = test$c.extend({
+const test$4 = test$d.extend({
   AdminProductDetail: async ({ AdminPage }, use) => {
     await use(new ProductDetail(AdminPage));
   },
@@ -2714,7 +2754,7 @@ const test$4 = test$c.extend({
   }
 });
 
-const ProductData = test$c.extend({
+const ProductData = test$d.extend({
   ProductData: async ({ IdProvider, SalesChannelBaseConfig, AdminApiContext, DefaultSalesChannel }, use) => {
     const { id: productId, uuid: productUuid } = IdProvider.getIdPair();
     const productName = `Product_test_${productId}`;
@@ -2775,7 +2815,7 @@ const ProductData = test$c.extend({
   }
 });
 
-const CategoryData = test$c.extend({
+const CategoryData = test$d.extend({
   CategoryData: async ({ IdProvider, AdminApiContext, DefaultSalesChannel, ProductData }, use) => {
     const { id: categoryId, uuid: categoryUuid } = IdProvider.getIdPair();
     const categoryName = `Category-${categoryId}`;
@@ -2802,7 +2842,7 @@ const CategoryData = test$c.extend({
   }
 });
 
-const DigitalProductData = test$c.extend({
+const DigitalProductData = test$d.extend({
   DigitalProductData: async ({ ProductData, IdProvider, AdminApiContext }, use) => {
     const newMediaResource = await AdminApiContext.post("./media?_response", {
       data: {
@@ -2857,7 +2897,7 @@ const DigitalProductData = test$c.extend({
   }
 });
 
-const PropertiesData = test$c.extend({
+const PropertiesData = test$d.extend({
   PropertiesData: async ({ AdminApiContext }, use) => {
     const propertyGroupColorResponse = await AdminApiContext.post("property-group?_response=1", {
       data: {
@@ -2907,7 +2947,7 @@ const PropertiesData = test$c.extend({
   }
 });
 
-const CartWithProductData = test$c.extend({
+const CartWithProductData = test$d.extend({
   CartWithProductData: async ({ StoreApiContext, DefaultSalesChannel, ProductData }, use) => {
     await StoreApiContext.login(DefaultSalesChannel.customer);
     const cartResponse = await StoreApiContext.post("checkout/cart", {
@@ -2933,7 +2973,7 @@ const CartWithProductData = test$c.extend({
   }
 });
 
-const PromotionWithCodeData = test$c.extend({
+const PromotionWithCodeData = test$d.extend({
   PromotionWithCodeData: async ({ AdminApiContext, DefaultSalesChannel, IdProvider }, use) => {
     const promotionCode = `${IdProvider.getIdPair().id}`;
     const promotionName = `Test Promotion ${promotionCode}`;
@@ -2975,7 +3015,7 @@ const PromotionWithCodeData = test$c.extend({
   }
 });
 
-const MediaData = test$c.extend({
+const MediaData = test$d.extend({
   MediaData: async ({ AdminApiContext, IdProvider }, use) => {
     const imageId = IdProvider.getIdPair().id;
     const imageFilePath = `./tmp/image-${imageId}.png`;
@@ -3022,7 +3062,7 @@ const MediaData = test$c.extend({
   }
 });
 
-const OrderData = test$c.extend({
+const OrderData = test$d.extend({
   OrderData: async ({ IdProvider, AdminApiContext, SalesChannelBaseConfig, DefaultSalesChannel, ProductData }, use) => {
     const requests = {
       currencyEUR: getCurrency("EUR", AdminApiContext),
@@ -3239,7 +3279,7 @@ const OrderData = test$c.extend({
   }
 });
 
-const TagData = test$c.extend({
+const TagData = test$d.extend({
   TagData: async ({ IdProvider, AdminApiContext }, use) => {
     const tagUUID = IdProvider.getIdPair().uuid;
     const tagId = IdProvider.getIdPair().id;
@@ -3270,7 +3310,7 @@ const test$3 = mergeTests(
   TagData
 );
 
-const SaveProduct = test$c.extend({
+const SaveProduct = test$d.extend({
   SaveProduct: async ({ ShopAdmin, AdminProductDetail }, use) => {
     const task = () => {
       return async function SaveProduct2() {
@@ -3292,7 +3332,7 @@ const test$2 = mergeTests(
   SaveProduct
 );
 
-const Login = test$c.extend({
+const Login = test$d.extend({
   Login: async ({ ShopCustomer, DefaultSalesChannel, StorefrontAccountLogin, StorefrontAccount }, use) => {
     const task = () => {
       return async function Login2() {
@@ -3308,7 +3348,7 @@ const Login = test$c.extend({
   }
 });
 
-const Logout = test$c.extend({
+const Logout = test$d.extend({
   Logout: async ({ ShopCustomer, StorefrontAccountLogin }, use) => {
     const task = () => {
       return async function Logout2() {
@@ -3322,7 +3362,7 @@ const Logout = test$c.extend({
   }
 });
 
-const Register = test$c.extend({
+const Register = test$d.extend({
   Register: async ({ StorefrontAccountLogin, AdminApiContext }, use) => {
     const registrationData = {
       firstName: "Jeff",
@@ -3365,7 +3405,7 @@ const Register = test$c.extend({
   }
 });
 
-const AddProductToCart = test$c.extend({
+const AddProductToCart = test$d.extend({
   AddProductToCart: async ({ ShopCustomer, StorefrontProductDetail }, use) => {
     const task = (ProductData, quantity = "1") => {
       return async function AddProductToCart2() {
@@ -3379,7 +3419,7 @@ const AddProductToCart = test$c.extend({
   }
 });
 
-const ProceedFromProductToCheckout = test$c.extend({
+const ProceedFromProductToCheckout = test$d.extend({
   ProceedFromProductToCheckout: async ({ ShopCustomer, StorefrontProductDetail, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function ProceedFromProductToCheckout2() {
@@ -3391,7 +3431,7 @@ const ProceedFromProductToCheckout = test$c.extend({
   }
 });
 
-const ProceedFromCartToCheckout = test$c.extend({
+const ProceedFromCartToCheckout = test$d.extend({
   ProceedFromCartToCheckout: async ({
     ShopCustomer,
     StorefrontCheckoutCart,
@@ -3407,7 +3447,7 @@ const ProceedFromCartToCheckout = test$c.extend({
   }
 });
 
-const ConfirmTermsAndConditions = test$c.extend({
+const ConfirmTermsAndConditions = test$d.extend({
   ConfirmTermsAndConditions: async ({ ShopCustomer, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function ConfirmTermsAndConditions2() {
@@ -3419,7 +3459,7 @@ const ConfirmTermsAndConditions = test$c.extend({
   }
 });
 
-const SelectCashOnDeliveryPaymentOption = test$c.extend({
+const SelectCashOnDeliveryPaymentOption = test$d.extend({
   SelectCashOnDeliveryPaymentOption: async ({ ShopCustomer, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function SelectCashOnDeliveryPaymentOption2() {
@@ -3431,7 +3471,7 @@ const SelectCashOnDeliveryPaymentOption = test$c.extend({
   }
 });
 
-const SelectInvoicePaymentOption = test$c.extend({
+const SelectInvoicePaymentOption = test$d.extend({
   SelectInvoicePaymentOption: async ({ ShopCustomer, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function SelectInvoicePaymentOption2() {
@@ -3443,7 +3483,7 @@ const SelectInvoicePaymentOption = test$c.extend({
   }
 });
 
-const SelectPaidInAdvancePaymentOption = test$c.extend({
+const SelectPaidInAdvancePaymentOption = test$d.extend({
   SelectPaidInAdvancePaymentOption: async ({ ShopCustomer, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function SelectPaidInAdvancePaymentOption2() {
@@ -3455,7 +3495,7 @@ const SelectPaidInAdvancePaymentOption = test$c.extend({
   }
 });
 
-const SelectStandardShippingOption = test$c.extend({
+const SelectStandardShippingOption = test$d.extend({
   SelectStandardShippingOption: async ({ ShopCustomer, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function SelectStandardShippingOption2() {
@@ -3467,7 +3507,7 @@ const SelectStandardShippingOption = test$c.extend({
   }
 });
 
-const SelectExpressShippingOption = test$c.extend({
+const SelectExpressShippingOption = test$d.extend({
   SelectExpressShippingOption: async ({ ShopCustomer, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function SelectExpressShippingOption2() {
@@ -3479,7 +3519,7 @@ const SelectExpressShippingOption = test$c.extend({
   }
 });
 
-const SubmitOrder = test$c.extend({
+const SubmitOrder = test$d.extend({
   SubmitOrder: async ({ ShopCustomer, StorefrontCheckoutConfirm, StorefrontCheckoutFinish }, use) => {
     const task = () => {
       return async function SubmitOrder2() {
@@ -3491,7 +3531,7 @@ const SubmitOrder = test$c.extend({
   }
 });
 
-const OpenSearchResultPage = test$c.extend({
+const OpenSearchResultPage = test$d.extend({
   OpenSearchResultPage: async ({ StorefrontSearch }, use) => {
     const task = (searchTerm) => {
       return async function OpenSearchResultPage2() {
@@ -3503,7 +3543,7 @@ const OpenSearchResultPage = test$c.extend({
   }
 });
 
-const OpenSearchSuggestPage = test$c.extend({
+const OpenSearchSuggestPage = test$d.extend({
   OpenSearchSuggestPage: async ({ StorefrontSearchSuggest }, use) => {
     const task = (searchTerm) => {
       return async function OpenSearchSuggestPage2() {
@@ -3515,7 +3555,7 @@ const OpenSearchSuggestPage = test$c.extend({
   }
 });
 
-const ValidateAccessibility = test$c.extend({
+const ValidateAccessibility = test$d.extend({
   ValidateAccessibility: async ({ ShopCustomer }, use) => {
     const task = (pageName, assertViolations = true, createReport = true, ruleTags = ["wcag2a", "wcag2aa", "wcag2aaa", "wcag21a", "wcag21aa", "best-practice"], outputDir = "test-results/AccessibilityReports") => {
       return async function ValidateAccessibility2() {
@@ -3561,6 +3601,7 @@ const test$1 = mergeTests(
 
 const test = mergeTests(
   test$6,
+  test$b,
   test$a,
   test$9,
   test$8,

package/package.json

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