@shopware-ag/acceptance-test-suite 11.1.5 → 11.2.0

package/dist/index.d.mts

@@ -4,6 +4,7 @@ import { APIRequestContext, APIResponse, Page, BrowserContext, Locator } from '@
 export * from '@playwright/test';
 import * as playwright_core from 'playwright-core';
 import { components } from '@shopware/api-client/admin-api-types';
+import { HelperFixtureTypes as HelperFixtureTypes$1 } from 'src/fixtures/HelperFixtures';
 import { Image } from 'image-js';
 
 type Task = (...args: any[]) => () => Promise<void>;
@@ -337,6 +338,8 @@ type SalesChannelAnalytics = components['schemas']['SalesChannelAnalytics'] & {
     id: string;
 };
 interface RegistrationData {
+    isCommercial: boolean;
+    isGuest: boolean;
     salutation: string;
     firstName: string;
     lastName: string;
@@ -1092,6 +1095,8 @@ interface PageObject {
 
 declare class Home implements PageObject {
     readonly page: Page;
+    readonly accountMenuButton: Locator;
+    readonly closeGuestSessionButton: Locator;
     readonly productImages: Locator;
     readonly productListItems: Locator;
     readonly languagesDropdown: Locator;
@@ -1564,6 +1569,7 @@ declare class CustomerGroupListing implements PageObject {
 
 declare class CustomerGroupCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly headline: Locator;
     readonly saveButton: Locator;
     readonly cancelButton: Locator;
@@ -1578,17 +1584,18 @@ declare class CustomerGroupCreate implements PageObject {
     readonly signupFormCompanySignupToggle: Locator;
     readonly customerGroupSaleschannelSelection: Locator;
     readonly customerGroupSaleschannelResultList: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     url(): string;
 }
 
 declare class CustomerGroupDetail extends CustomerGroupCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly headline: Locator;
     readonly selectedSalesChannel: Locator;
     readonly technicalUrl: Locator;
     readonly saleschannelUrl: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     url(customerGroupId?: string): string;
 }
 
@@ -1921,6 +1928,7 @@ declare class RuleCreate implements PageObject {
 
 declare class RuleDetail extends RuleCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly shippingMethodAvailabilityRulesCard: Locator;
     readonly shippingMethodAvailabilityRulesCardLink: Locator;
     readonly shippingMethodAvailabilityRulesCardTable: Locator;
@@ -1937,7 +1945,9 @@ declare class RuleDetail extends RuleCreate implements PageObject {
     readonly promotionCustomerRulesCardEmptyState: Locator;
     readonly promotionCartRulesCard: Locator;
     readonly promotionCartRulesCardEmptyState: Locator;
-    constructor(page: Page);
+    readonly assignmentModalAddButton: Locator;
+    readonly assignmentModalSearchField: Locator;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getEntityCard(cardLocator: Locator): Promise<Record<string, Locator>>;
     url(ruleId?: string, tabName?: string): string;
 }
@@ -1951,12 +1961,13 @@ declare class RuleListing implements PageObject {
 
 declare class ManufacturerCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly saveButton: Locator;
     readonly cancelButton: Locator;
     readonly nameInput: Locator;
     readonly websiteInput: Locator;
     readonly descriptionInput: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     url(): string;
 }
 
@@ -1971,10 +1982,11 @@ declare class ManufacturerListing implements PageObject {
 
 declare class ManufacturerDetail extends ManufacturerCreate {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly customFieldCard: Locator;
     readonly customFieldSetTabs: Locator;
     readonly customFieldSetTabCustomContent: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     url(manufacturerUuid?: string): string;
 }

package/dist/index.d.ts

@@ -4,6 +4,7 @@ import { APIRequestContext, APIResponse, Page, BrowserContext, Locator } from '@
 export * from '@playwright/test';
 import * as playwright_core from 'playwright-core';
 import { components } from '@shopware/api-client/admin-api-types';
+import { HelperFixtureTypes as HelperFixtureTypes$1 } from 'src/fixtures/HelperFixtures';
 import { Image } from 'image-js';
 
 type Task = (...args: any[]) => () => Promise<void>;
@@ -337,6 +338,8 @@ type SalesChannelAnalytics = components['schemas']['SalesChannelAnalytics'] & {
     id: string;
 };
 interface RegistrationData {
+    isCommercial: boolean;
+    isGuest: boolean;
     salutation: string;
     firstName: string;
     lastName: string;
@@ -1092,6 +1095,8 @@ interface PageObject {
 
 declare class Home implements PageObject {
     readonly page: Page;
+    readonly accountMenuButton: Locator;
+    readonly closeGuestSessionButton: Locator;
     readonly productImages: Locator;
     readonly productListItems: Locator;
     readonly languagesDropdown: Locator;
@@ -1564,6 +1569,7 @@ declare class CustomerGroupListing implements PageObject {
 
 declare class CustomerGroupCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly headline: Locator;
     readonly saveButton: Locator;
     readonly cancelButton: Locator;
@@ -1578,17 +1584,18 @@ declare class CustomerGroupCreate implements PageObject {
     readonly signupFormCompanySignupToggle: Locator;
     readonly customerGroupSaleschannelSelection: Locator;
     readonly customerGroupSaleschannelResultList: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     url(): string;
 }
 
 declare class CustomerGroupDetail extends CustomerGroupCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly headline: Locator;
     readonly selectedSalesChannel: Locator;
     readonly technicalUrl: Locator;
     readonly saleschannelUrl: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     url(customerGroupId?: string): string;
 }
 
@@ -1921,6 +1928,7 @@ declare class RuleCreate implements PageObject {
 
 declare class RuleDetail extends RuleCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly shippingMethodAvailabilityRulesCard: Locator;
     readonly shippingMethodAvailabilityRulesCardLink: Locator;
     readonly shippingMethodAvailabilityRulesCardTable: Locator;
@@ -1937,7 +1945,9 @@ declare class RuleDetail extends RuleCreate implements PageObject {
     readonly promotionCustomerRulesCardEmptyState: Locator;
     readonly promotionCartRulesCard: Locator;
     readonly promotionCartRulesCardEmptyState: Locator;
-    constructor(page: Page);
+    readonly assignmentModalAddButton: Locator;
+    readonly assignmentModalSearchField: Locator;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getEntityCard(cardLocator: Locator): Promise<Record<string, Locator>>;
     url(ruleId?: string, tabName?: string): string;
 }
@@ -1951,12 +1961,13 @@ declare class RuleListing implements PageObject {
 
 declare class ManufacturerCreate implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly saveButton: Locator;
     readonly cancelButton: Locator;
     readonly nameInput: Locator;
     readonly websiteInput: Locator;
     readonly descriptionInput: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     url(): string;
 }
 
@@ -1971,10 +1982,11 @@ declare class ManufacturerListing implements PageObject {
 
 declare class ManufacturerDetail extends ManufacturerCreate {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes$1['InstanceMeta'];
     readonly customFieldCard: Locator;
     readonly customFieldSetTabs: Locator;
     readonly customFieldSetTabCustomContent: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes$1['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     url(manufacturerUuid?: string): string;
 }

package/dist/index.mjs

@@ -3026,6 +3026,8 @@ var __publicField$O = (obj, key, value) => {
 class Home {
   constructor(page) {
     this.page = page;
+    __publicField$O(this, "accountMenuButton");
+    __publicField$O(this, "closeGuestSessionButton");
     __publicField$O(this, "productImages");
     __publicField$O(this, "productListItems");
     __publicField$O(this, "languagesDropdown");
@@ -3045,6 +3047,8 @@ class Home {
     __publicField$O(this, "consentDialogSaveButton");
     __publicField$O(this, "consentCookieBannerContainer");
     __publicField$O(this, "offcanvasBackdrop");
+    this.accountMenuButton = page.getByLabel("Your account");
+    this.closeGuestSessionButton = page.locator(".account-aside-btn");
     this.productImages = page.locator(".product-image-wrapper");
     this.productListItems = page.getByRole("listitem");
     this.languagesDropdown = page.locator(".top-bar-language").filter({ has: page.getByRole("button") });
@@ -4186,8 +4190,9 @@ var __publicField$r = (obj, key, value) => {
   return value;
 };
 class CustomerGroupCreate {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$r(this, "headline");
     __publicField$r(this, "saveButton");
     __publicField$r(this, "cancelButton");
@@ -4211,7 +4216,11 @@ class CustomerGroupCreate {
     this.customerGroupNetTaxDisplay = page.locator("#sw-field--castedValue-1");
     this.customSignupFormToggle = page.getByLabel("Custom signup form");
     this.signupFormTitle = page.locator("#sw-field--customerGroup-registrationTitle");
-    this.signupFormIntroduction = page.locator(".sw-text-editor__content-editor");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.signupFormIntroduction = page.locator(".sw-text-editor__content-editor");
+    } else {
+      this.signupFormIntroduction = page.locator(".mt-text-editor__content-editor");
+    }
     this.signupFormSeoDescription = page.locator("#sw-field--customerGroup-registrationSeoMetaDescription");
     this.signupFormCompanySignupToggle = page.getByLabel("Company signup form");
     this.customerGroupSaleschannelSelection = page.locator("input[class=sw-select-selection-list__input]");
@@ -4229,9 +4238,10 @@ var __publicField$q = (obj, key, value) => {
   return value;
 };
 class CustomerGroupDetail extends CustomerGroupCreate {
-  constructor(page) {
-    super(page);
+  constructor(page, instanceMeta) {
+    super(page, instanceMeta);
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$q(this, "headline");
     __publicField$q(this, "selectedSalesChannel");
     __publicField$q(this, "technicalUrl");
@@ -5008,9 +5018,10 @@ var __publicField$8 = (obj, key, value) => {
   return value;
 };
 class RuleDetail extends RuleCreate {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     super(page);
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$8(this, "shippingMethodAvailabilityRulesCard");
     __publicField$8(this, "shippingMethodAvailabilityRulesCardLink");
     __publicField$8(this, "shippingMethodAvailabilityRulesCardTable");
@@ -5027,11 +5038,13 @@ class RuleDetail extends RuleCreate {
     __publicField$8(this, "promotionCustomerRulesCardEmptyState");
     __publicField$8(this, "promotionCartRulesCard");
     __publicField$8(this, "promotionCartRulesCardEmptyState");
+    __publicField$8(this, "assignmentModalAddButton");
+    __publicField$8(this, "assignmentModalSearchField");
     this.shippingMethodAvailabilityRulesCard = page.locator(".sw-settings-rule-detail-assignments__card-shipping_method_availability_rule");
     this.shippingMethodAvailabilityRulesCardLink = this.shippingMethodAvailabilityRulesCard.getByRole("link");
     this.shippingMethodAvailabilityRulesCardTable = page.locator(".sw-settings-rule-detail-assignments__entity-listing-shipping_method_availability_rule");
     this.shippingMethodAvailabilityRulesCardEmptyState = this.shippingMethodAvailabilityRulesCard.getByRole("alert");
-    this.shippingMethodAvailabilityRulesCardSearchField = this.shippingMethodAvailabilityRulesCard.getByPlaceholder("Search...");
+    this.shippingMethodAvailabilityRulesCardSearchField = this.shippingMethodAvailabilityRulesCard.getByRole("textbox");
     this.taxProviderRulesCard = page.locator(".sw-settings-rule-detail-assignments__card-tax_provider");
     this.taxProviderRulesCardEmptyState = this.taxProviderRulesCard.getByRole("alert");
     this.paymentMethodsAvailabilityRulesCard = page.locator(".sw-settings-rule-detail-assignments__card-payment_method");
@@ -5043,6 +5056,12 @@ class RuleDetail extends RuleCreate {
     this.promotionCustomerRulesCardEmptyState = this.promotionCustomerRulesCard.getByRole("alert");
     this.promotionCartRulesCard = page.locator(".sw-settings-rule-detail-assignments__card-promotion_cart_rule");
     this.promotionCartRulesCardEmptyState = this.promotionCartRulesCard.getByRole("alert");
+    this.assignmentModalSearchField = page.locator(".sw-settings-rule-add-assignment-modal").getByRole("textbox");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.assignmentModalAddButton = page.locator(".sw-button--primary").getByText("Add");
+    } else {
+      this.assignmentModalAddButton = page.locator(".mt-button--primary").getByText("Add");
+    }
   }
   async getEntityCard(cardLocator) {
     return {
@@ -5078,8 +5097,9 @@ var __publicField$6 = (obj, key, value) => {
   return value;
 };
 class ManufacturerCreate {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$6(this, "saveButton");
     __publicField$6(this, "cancelButton");
     __publicField$6(this, "nameInput");
@@ -5089,7 +5109,11 @@ class ManufacturerCreate {
     this.cancelButton = page.getByRole("button", { name: "Cancel" });
     this.nameInput = page.getByLabel("Name");
     this.websiteInput = page.getByLabel("Website");
-    this.descriptionInput = page.locator(".sw-text-editor__content-editor");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.descriptionInput = page.locator(".sw-text-editor__content-editor");
+    } else {
+      this.descriptionInput = page.locator(".mt-text-editor__content-editor");
+    }
   }
   url() {
     return `#/sw/manufacturer/create`;
@@ -5145,9 +5169,10 @@ var __publicField$4 = (obj, key, value) => {
   return value;
 };
 class ManufacturerDetail extends ManufacturerCreate {
-  constructor(page) {
-    super(page);
+  constructor(page, instanceMeta) {
+    super(page, instanceMeta);
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$4(this, "customFieldCard");
     __publicField$4(this, "customFieldSetTabs");
     __publicField$4(this, "customFieldSetTabCustomContent");
@@ -5468,11 +5493,11 @@ const test$5 = test$e.extend({
   AdminCustomerGroupListing: async ({ AdminPage }, use) => {
     await use(new CustomerGroupListing(AdminPage));
   },
-  AdminCustomerGroupCreate: async ({ AdminPage }, use) => {
-    await use(new CustomerGroupCreate(AdminPage));
+  AdminCustomerGroupCreate: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new CustomerGroupCreate(AdminPage, InstanceMeta));
   },
-  AdminCustomerGroupDetail: async ({ AdminPage }, use) => {
-    await use(new CustomerGroupDetail(AdminPage));
+  AdminCustomerGroupDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new CustomerGroupDetail(AdminPage, InstanceMeta));
   },
   AdminFirstRunWizard: async ({ AdminPage, InstanceMeta }, use) => {
     await use(new FirstRunWizard(AdminPage, InstanceMeta));
@@ -5525,8 +5550,8 @@ const test$5 = test$e.extend({
   AdminRuleCreate: async ({ AdminPage }, use) => {
     await use(new RuleCreate(AdminPage));
   },
-  AdminRuleDetail: async ({ AdminPage }, use) => {
-    await use(new RuleDetail(AdminPage));
+  AdminRuleDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new RuleDetail(AdminPage, InstanceMeta));
   },
   AdminRuleListing: async ({ AdminPage }, use) => {
     await use(new RuleListing(AdminPage));
@@ -5534,11 +5559,11 @@ const test$5 = test$e.extend({
   AdminManufacturerListing: async ({ AdminPage }, use) => {
     await use(new ManufacturerListing(AdminPage));
   },
-  AdminManufacturerCreate: async ({ AdminPage }, use) => {
-    await use(new ManufacturerCreate(AdminPage));
+  AdminManufacturerCreate: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new ManufacturerCreate(AdminPage, InstanceMeta));
   },
-  AdminManufacturerDetail: async ({ AdminPage }, use) => {
-    await use(new ManufacturerDetail(AdminPage));
+  AdminManufacturerDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new ManufacturerDetail(AdminPage, InstanceMeta));
   },
   AdminProductListing: async ({ AdminPage }, use) => {
     await use(new ProductListing(AdminPage));
@@ -6365,9 +6390,9 @@ const AssignEntitiesToRule = test$e.extend({
         async function entityAssignment(entityName, card) {
           const entityCard = await AdminRuleDetail.getEntityCard(card);
           await entityCard.addAssignmentButton.click();
-          await AdminRuleDetail.page.locator(".sw-settings-rule-add-assignment-modal").getByPlaceholder("Search...").fill(entityName);
+          await AdminRuleDetail.assignmentModalSearchField.fill(entityName);
           await AdminRuleDetail.page.locator(".sw-data-grid__row").filter({ hasText: entityName }).getByRole("checkbox").click();
-          await AdminRuleDetail.page.locator(".sw-button--primary").getByText("Add").click();
+          await AdminRuleDetail.assignmentModalAddButton.click();
         }
         for (const assignableEntity of assignableEntities) {
           switch (assignableEntity.ruleType) {
@@ -6442,10 +6467,12 @@ const Register = test$e.extend({
   Register: async ({ StorefrontAccountLogin, AdminApiContext: AdminApiContext2, IdProvider }, use) => {
     let registeredEmail = "";
     const defaultRegistrationData = {
+      isCommercial: false,
+      isGuest: false,
       salutation: "Mr.",
       firstName: "Jeff",
       lastName: "Goldblum",
-      email: IdProvider.getIdPair().uuid + "@test.com",
+      email: `${IdProvider.getIdPair().uuid}@test.com`,
       password: "shopware",
       street: "Ebbinghof 10",
       city: "Sch\xF6ppingen",
@@ -6455,20 +6482,23 @@ const Register = test$e.extend({
       department: "Operations",
       vatRegNo: "DE1234567890"
     };
-    const registerTask = (overrides, isCommercial) => {
-      return async function() {
+    const task = (overrides, isCommercial) => {
+      return async function Register2() {
         const registrationData = { ...defaultRegistrationData, ...overrides };
         registeredEmail = registrationData.email;
-        await StorefrontAccountLogin.salutationSelect.selectOption(registrationData.salutation);
-        await StorefrontAccountLogin.firstNameInput.fill(registrationData.firstName);
-        await StorefrontAccountLogin.lastNameInput.fill(registrationData.lastName);
-        if (isCommercial) {
+        if (registrationData.isCommercial || isCommercial) {
+          await StorefrontAccountLogin.accountTypeSelect.selectOption("Commercial");
           await StorefrontAccountLogin.companyInput.fill(registrationData.company);
           await StorefrontAccountLogin.departmentInput.fill(registrationData.department);
           await StorefrontAccountLogin.vatRegNoInput.fill(registrationData.vatRegNo);
         }
+        await StorefrontAccountLogin.salutationSelect.selectOption(registrationData.salutation);
+        await StorefrontAccountLogin.firstNameInput.fill(registrationData.firstName);
+        await StorefrontAccountLogin.lastNameInput.fill(registrationData.lastName);
         await StorefrontAccountLogin.registerEmailInput.fill(registrationData.email);
-        await StorefrontAccountLogin.registerPasswordInput.fill(registrationData.password);
+        if (!registrationData.isGuest) {
+          await StorefrontAccountLogin.registerPasswordInput.fill(registrationData.password);
+        }
         await StorefrontAccountLogin.streetAddressInput.fill(registrationData.street);
         await StorefrontAccountLogin.postalCodeInput.fill(registrationData.postalCode);
         await StorefrontAccountLogin.cityInput.fill(registrationData.city);
@@ -6476,28 +6506,32 @@ const Register = test$e.extend({
         await StorefrontAccountLogin.registerButton.click();
       };
     };
-    await use(registerTask);
+    await use(task);
     await deleteRegisteredUser(AdminApiContext2, registeredEmail);
   }
 });
 async function deleteRegisteredUser(adminApiContext, email) {
   if (!email)
     return;
-  const response = await adminApiContext.post("search/customer", {
-    data: {
-      limit: 1,
-      filter: [
-        {
-          type: "equals",
-          field: "email",
-          value: email
-        }
-      ]
+  try {
+    const response = await adminApiContext.post("search/customer", {
+      data: {
+        limit: 1,
+        filter: [
+          {
+            type: "equals",
+            field: "email",
+            value: email
+          }
+        ]
+      }
+    });
+    const { data: customers } = await response.json();
+    for (const customer of customers) {
+      await adminApiContext.delete(`customer/${customer.id}`);
     }
-  });
-  const { data: customers } = await response.json();
-  for (const customer of customers) {
-    await adminApiContext.delete(`customer/${customer.id}`);
+  } catch (error) {
+    console.error(`Error deleting user with email ${email}:`, error);
   }
 }
 

package/package.json

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