@shopware-ag/acceptance-test-suite 11.9.2 → 11.10.0

package/dist/index.d.mts

@@ -1753,15 +1753,28 @@ declare class ProductDetail implements PageObject {
     constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     url(productId: string): string;
+    getCustomFieldCardLocators(customFieldSetName: string, customFieldTextName: string): Promise<{
+        customFieldCard: Locator;
+        customFieldSetTab: Locator;
+        customFieldLabel: Locator;
+        customFieldSelect: Locator;
+    }>;
 }
 
 declare class OrderDetail implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly saveButton: Locator;
     readonly dataGridContextButton: Locator;
     readonly orderTag: Locator;
-    constructor(page: Page);
-    url(orderId: string): string;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
+    url(orderId: string, tabName?: string): string;
+    getCustomFieldCardLocators(customFieldSetName: string, customFieldTextName: string): Promise<{
+        customFieldCard: Locator;
+        customFieldSetTab: Locator;
+        customFieldLabel: Locator;
+        customFieldSelect: Locator;
+    }>;
 }
 
 declare class CustomerListing implements PageObject {
@@ -2126,6 +2139,7 @@ declare class CustomFieldCreate implements PageObject {
 
 declare class CustomFieldDetail extends CustomFieldCreate {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly newCustomFieldButton: Locator;
     readonly customFieldEditDialog: Locator;
     readonly newCustomFieldDialog: Locator;
@@ -2143,9 +2157,11 @@ declare class CustomFieldDetail extends CustomFieldCreate {
     readonly customFieldDeleteDialog: Locator;
     readonly customFieldDeleteCancelButton: Locator;
     readonly customFieldDeleteButton: Locator;
-    constructor(page: Page);
+    readonly customFieldEditAvailableInShoppingCartCheckbox: Locator;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getLineItemByCustomFieldName(customFieldName: string): Promise<Record<string, Locator>>;
     url(customFieldUuid?: string): string;
+    getSelectFieldListitem(selectField: Locator, listItem: string): Promise<Locator>;
 }
 
 declare class CategoryDetail implements PageObject {
@@ -2159,6 +2175,12 @@ declare class CategoryDetail implements PageObject {
     constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     url(categoryUuid: string): string;
+    getCustomFieldCardLocators(customFieldSetName: string, customFieldTextName: string): Promise<{
+        customFieldCard: Locator;
+        customFieldSetTab: Locator;
+        customFieldLabel: Locator;
+        customFieldSelect: Locator;
+    }>;
 }
 
 declare class RuleCreate implements PageObject {

package/dist/index.d.ts

@@ -1753,15 +1753,28 @@ declare class ProductDetail implements PageObject {
     constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     url(productId: string): string;
+    getCustomFieldCardLocators(customFieldSetName: string, customFieldTextName: string): Promise<{
+        customFieldCard: Locator;
+        customFieldSetTab: Locator;
+        customFieldLabel: Locator;
+        customFieldSelect: Locator;
+    }>;
 }
 
 declare class OrderDetail implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly saveButton: Locator;
     readonly dataGridContextButton: Locator;
     readonly orderTag: Locator;
-    constructor(page: Page);
-    url(orderId: string): string;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
+    url(orderId: string, tabName?: string): string;
+    getCustomFieldCardLocators(customFieldSetName: string, customFieldTextName: string): Promise<{
+        customFieldCard: Locator;
+        customFieldSetTab: Locator;
+        customFieldLabel: Locator;
+        customFieldSelect: Locator;
+    }>;
 }
 
 declare class CustomerListing implements PageObject {
@@ -2126,6 +2139,7 @@ declare class CustomFieldCreate implements PageObject {
 
 declare class CustomFieldDetail extends CustomFieldCreate {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly newCustomFieldButton: Locator;
     readonly customFieldEditDialog: Locator;
     readonly newCustomFieldDialog: Locator;
@@ -2143,9 +2157,11 @@ declare class CustomFieldDetail extends CustomFieldCreate {
     readonly customFieldDeleteDialog: Locator;
     readonly customFieldDeleteCancelButton: Locator;
     readonly customFieldDeleteButton: Locator;
-    constructor(page: Page);
+    readonly customFieldEditAvailableInShoppingCartCheckbox: Locator;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getLineItemByCustomFieldName(customFieldName: string): Promise<Record<string, Locator>>;
     url(customFieldUuid?: string): string;
+    getSelectFieldListitem(selectField: Locator, listItem: string): Promise<Locator>;
 }
 
 declare class CategoryDetail implements PageObject {
@@ -2159,6 +2175,12 @@ declare class CategoryDetail implements PageObject {
     constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     url(categoryUuid: string): string;
+    getCustomFieldCardLocators(customFieldSetName: string, customFieldTextName: string): Promise<{
+        customFieldCard: Locator;
+        customFieldSetTab: Locator;
+        customFieldLabel: Locator;
+        customFieldSelect: Locator;
+    }>;
 }
 
 declare class RuleCreate implements PageObject {

package/dist/index.mjs

@@ -556,7 +556,7 @@ const isSaaSInstance = async (adminApiContext) => {
 const isThemeCompiled = async (context, storefrontUrl) => {
   const response = await context.get(storefrontUrl);
   const body = (await response.body()).toString();
-  const matches = body.match(/.*"(https:\/\/.*all\.css[^"]*)".*/);
+  const matches = body.match(/.*"(https?:\/\/.*all\.css[^"]*)".*/);
   if (matches && matches?.length > 1) {
     const allCssUrl = matches[1];
     const allCssResponse = await context.get(allCssUrl);
@@ -602,7 +602,7 @@ const test$b = test$f.extend({
     });
     await expect(page.url()).toContain("login");
     await page.getByLabel(/Username|Email address/).fill(adminUser.username);
-    await page.getByLabel("Password").fill(adminUser.password);
+    await page.getByLabel("Password", { exact: true }).fill(adminUser.password);
     const config = await (await AdminApiContext.get("./_info/config")).json();
     const jsLoadingPromises = [];
     for (const i in config.bundles) {
@@ -639,16 +639,13 @@ const test$b = test$f.extend({
       baseURL: url
     });
     const page = await context.newPage();
-    const isSaasInstance = await isSaaSInstance(AdminApiContext);
     if (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
       test$f.slow();
       await AdminApiContext.post(
         `./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${salesChannel.id}`
       );
-      if (isSaasInstance) {
-        while (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
-          await page.waitForTimeout(4e3);
-        }
+      while (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
+        await page.waitForTimeout(4e3);
       }
     }
     await page.goto("./", { waitUntil: "load" });
@@ -4472,6 +4469,24 @@ const test$7 = test$f.extend({
   }
 });
 
+async function getCustomFieldCardLocators(page, customFieldSetName, customFieldName, instanceMeta) {
+  let customFieldCard;
+  if (satisfies(instanceMeta.version, "<6.7")) {
+    customFieldCard = page.locator(".sw-card").filter({ hasText: "Custom fields" });
+  } else {
+    customFieldCard = page.locator(".mt-card").filter({ hasText: "Custom fields" });
+  }
+  const customFieldSetTab = customFieldCard.getByText(customFieldSetName);
+  const customFieldLabel = customFieldCard.locator(".sw-custom-field-set-renderer").locator(".sw-field__label").getByText(customFieldName);
+  const customFieldSelect = customFieldCard.locator(`.sw-custom-field-set-renderer-tab-content__${customFieldSetName}`);
+  return {
+    customFieldCard,
+    customFieldSetTab,
+    customFieldLabel,
+    customFieldSelect
+  };
+}
+
 var __defProp$w = Object.defineProperty;
 var __defNormalProp$w = (obj, key, value) => key in obj ? __defProp$w(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$w = (obj, key, value) => {
@@ -4599,6 +4614,9 @@ class ProductDetail {
   url(productId) {
     return `#/sw/product/detail/${productId}/base`;
   }
+  async getCustomFieldCardLocators(customFieldSetName, customFieldTextName) {
+    return getCustomFieldCardLocators(this.page, customFieldSetName, customFieldTextName, this.instanceMeta);
+  }
 }
 
 var __defProp$v = Object.defineProperty;
@@ -4608,8 +4626,9 @@ var __publicField$v = (obj, key, value) => {
   return value;
 };
 class OrderDetail {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$v(this, "saveButton");
     __publicField$v(this, "dataGridContextButton");
     __publicField$v(this, "orderTag");
@@ -4617,8 +4636,11 @@ class OrderDetail {
     this.dataGridContextButton = page.locator(".sw-data-grid__actions-menu").and(page.getByRole("button"));
     this.orderTag = page.locator(".sw-select-selection-list__item");
   }
-  url(orderId) {
-    return `#/sw/order/detail/${orderId}/general`;
+  url(orderId, tabName = "general") {
+    return `#/sw/order/detail/${orderId}/${tabName}`;
+  }
+  async getCustomFieldCardLocators(customFieldSetName, customFieldTextName) {
+    return getCustomFieldCardLocators(this.page, customFieldSetName, customFieldTextName, this.instanceMeta);
   }
 }
 
@@ -5516,6 +5538,17 @@ class CustomFieldCreate {
   }
 }
 
+async function getSelectFieldListitem(page, selectField, listItem, instanceMeta) {
+  await selectField.click();
+  if (satisfies(instanceMeta.version, "<6.7")) {
+    await page.locator(".sw-select-result-list__item-list").waitFor({ state: "visible" });
+    return page.locator(".sw-select-result-list__content").getByRole("listitem").filter({ hasText: listItem });
+  } else {
+    await page.locator(".mt-select-result-list__item-list").waitFor({ state: "visible" });
+    return page.locator(".mt-select-result-list__item-list").getByRole("listitem").filter({ hasText: listItem });
+  }
+}
+
 var __defProp$b = Object.defineProperty;
 var __defNormalProp$b = (obj, key, value) => key in obj ? __defProp$b(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField$b = (obj, key, value) => {
@@ -5523,9 +5556,10 @@ var __publicField$b = (obj, key, value) => {
   return value;
 };
 class CustomFieldDetail extends CustomFieldCreate {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     super(page);
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$b(this, "newCustomFieldButton");
     __publicField$b(this, "customFieldEditDialog");
     __publicField$b(this, "newCustomFieldDialog");
@@ -5543,19 +5577,25 @@ class CustomFieldDetail extends CustomFieldCreate {
     __publicField$b(this, "customFieldDeleteDialog");
     __publicField$b(this, "customFieldDeleteCancelButton");
     __publicField$b(this, "customFieldDeleteButton");
+    __publicField$b(this, "customFieldEditAvailableInShoppingCartCheckbox");
     this.newCustomFieldButton = page.getByRole("button", { name: "New custom field" });
     this.customFieldDeleteListButton = page.locator(".sw-custom-field-list__delete-button");
     this.newCustomFieldDialog = page.getByRole("dialog", { name: "New custom field" });
     this.customFieldAddButton = this.newCustomFieldDialog.getByRole("button", { name: "Add" });
-    this.customFieldTechnicalNameInput = this.newCustomFieldDialog.getByLabel("Technical Name");
+    this.customFieldTechnicalNameInput = this.newCustomFieldDialog.getByLabel("Technical name");
     this.customFieldPositionInput = this.newCustomFieldDialog.getByLabel("Position");
-    this.customFieldTypeSelectionList = this.newCustomFieldDialog.getByLabel("Type");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.customFieldTypeSelectionList = this.newCustomFieldDialog.getByLabel("Type");
+    } else {
+      this.customFieldTypeSelectionList = this.newCustomFieldDialog.getByRole("textbox", { name: "Select..." });
+    }
     this.customFieldModifyByStoreApiCheckbox = this.newCustomFieldDialog.getByLabel("Modifiable via Store API");
     this.customFieldCancelButton = this.newCustomFieldDialog.getByRole("button", { name: "Cancel" });
     this.customFieldLabelEnglishGBInput = this.newCustomFieldDialog.getByLabel("Label (English (GB))");
     this.customFieldPlaceholderEnglishGBInput = this.newCustomFieldDialog.getByLabel("Placeholder (English (GB))");
     this.customFieldHelpTextEnglishGBInput = this.newCustomFieldDialog.getByLabel("Help text (English (GB))");
     this.customFieldEditDialog = page.getByRole("dialog", { name: "Edit custom field" });
+    this.customFieldEditAvailableInShoppingCartCheckbox = this.customFieldEditDialog.getByLabel("Available in shopping cart");
     this.customFieldEditApplyButton = this.customFieldEditDialog.getByRole("button", { name: "Apply changes" });
     this.customFieldDeleteDialog = page.getByRole("dialog", { name: "Delete custom field" });
     this.customFieldDeleteCancelButton = this.customFieldDeleteDialog.getByRole("button", { name: "Cancel" });
@@ -5585,6 +5625,9 @@ class CustomFieldDetail extends CustomFieldCreate {
   url(customFieldUuid) {
     return `#/sw/settings/custom/field/detail/${customFieldUuid}`;
   }
+  async getSelectFieldListitem(selectField, listItem) {
+    return getSelectFieldListitem(this.page, selectField, listItem, this.instanceMeta);
+  }
 }
 
 var __defProp$a = Object.defineProperty;
@@ -5629,6 +5672,9 @@ class CategoryDetail {
   url(categoryUuid) {
     return `#/sw/category/index/${categoryUuid}/base`;
   }
+  async getCustomFieldCardLocators(customFieldSetName, customFieldTextName) {
+    return getCustomFieldCardLocators(this.page, customFieldSetName, customFieldTextName, this.instanceMeta);
+  }
 }
 
 var __defProp$9 = Object.defineProperty;
@@ -6139,8 +6185,8 @@ const test$6 = test$f.extend({
   AdminProductDetail: async ({ AdminPage, InstanceMeta }, use) => {
     await use(new ProductDetail(AdminPage, InstanceMeta));
   },
-  AdminOrderDetail: async ({ AdminPage }, use) => {
-    await use(new OrderDetail(AdminPage));
+  AdminOrderDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new OrderDetail(AdminPage, InstanceMeta));
   },
   AdminCustomerListing: async ({ AdminPage }, use) => {
     await use(new CustomerListing(AdminPage));
@@ -6202,8 +6248,8 @@ const test$6 = test$f.extend({
   AdminCustomFieldCreate: async ({ AdminPage }, use) => {
     await use(new CustomFieldCreate(AdminPage));
   },
-  AdminCustomFieldDetail: async ({ AdminPage }, use) => {
-    await use(new CustomFieldDetail(AdminPage));
+  AdminCustomFieldDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new CustomFieldDetail(AdminPage, InstanceMeta));
   },
   AdminRuleCreate: async ({ AdminPage }, use) => {
     await use(new RuleCreate(AdminPage));

package/package.json

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