@shopware-ag/acceptance-test-suite 11.0.0 → 11.1.1

package/dist/index.d.mts

@@ -1044,12 +1044,14 @@ interface TestDataFixtureTypes {
     TestDataService: TestDataService;
 }
 
+type FeaturesType = Record<string, boolean>;
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
     SaaSInstanceSetup: () => Promise<void>;
     InstanceMeta: {
         version: string;
         isSaaS: boolean;
+        features: FeaturesType;
     };
 }
 
@@ -1223,6 +1225,7 @@ declare class CheckoutRegister implements PageObject {
 
 declare class Account implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly headline: Locator;
     readonly personalDataCardTitle: Locator;
     readonly paymentMethodCardTitle: Locator;
@@ -1231,7 +1234,7 @@ declare class Account implements PageObject {
     readonly newsletterCheckbox: Locator;
     readonly newsletterRegistrationSuccessMessage: Locator;
     readonly customerGroupRequestMessage: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomerGroupAlert(customerGroup: string): Promise<Locator>;
     url(): string;
 }
@@ -1529,6 +1532,7 @@ declare class CustomerListing implements PageObject {
 
 declare class CustomerDetail implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly editButton: Locator;
     readonly generalTab: Locator;
     readonly accountCard: Locator;
@@ -1540,7 +1544,7 @@ declare class CustomerDetail implements PageObject {
     readonly customerGroupDeclineButton: Locator;
     readonly tagList: Locator;
     readonly tagItems: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     getCustomerGroupAlert(customerGroup: string): Promise<Locator>;
     getCustomerGroup(): Promise<Locator>;
@@ -1590,6 +1594,7 @@ declare class CustomerGroupDetail extends CustomerGroupCreate implements PageObj
 
 declare class FirstRunWizard implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly nextButton: Locator;
     readonly configureLaterButton: Locator;
     readonly skipButton: Locator;
@@ -1628,7 +1633,7 @@ declare class FirstRunWizard implements PageObject {
     readonly toolsSelector: Locator;
     readonly recommendationHeader: Locator;
     readonly toolsRecommendedPlugin: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     url(): string;
 }
 

package/dist/index.d.ts

@@ -1044,12 +1044,14 @@ interface TestDataFixtureTypes {
     TestDataService: TestDataService;
 }
 
+type FeaturesType = Record<string, boolean>;
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
     SaaSInstanceSetup: () => Promise<void>;
     InstanceMeta: {
         version: string;
         isSaaS: boolean;
+        features: FeaturesType;
     };
 }
 
@@ -1223,6 +1225,7 @@ declare class CheckoutRegister implements PageObject {
 
 declare class Account implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly headline: Locator;
     readonly personalDataCardTitle: Locator;
     readonly paymentMethodCardTitle: Locator;
@@ -1231,7 +1234,7 @@ declare class Account implements PageObject {
     readonly newsletterCheckbox: Locator;
     readonly newsletterRegistrationSuccessMessage: Locator;
     readonly customerGroupRequestMessage: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomerGroupAlert(customerGroup: string): Promise<Locator>;
     url(): string;
 }
@@ -1529,6 +1532,7 @@ declare class CustomerListing implements PageObject {
 
 declare class CustomerDetail implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly editButton: Locator;
     readonly generalTab: Locator;
     readonly accountCard: Locator;
@@ -1540,7 +1544,7 @@ declare class CustomerDetail implements PageObject {
     readonly customerGroupDeclineButton: Locator;
     readonly tagList: Locator;
     readonly tagItems: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getCustomFieldSetCardContentByName(customFieldSetName: string): Promise<Record<string, Locator>>;
     getCustomerGroupAlert(customerGroup: string): Promise<Locator>;
     getCustomerGroup(): Promise<Locator>;
@@ -1590,6 +1594,7 @@ declare class CustomerGroupDetail extends CustomerGroupCreate implements PageObj
 
 declare class FirstRunWizard implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     readonly nextButton: Locator;
     readonly configureLaterButton: Locator;
     readonly skipButton: Locator;
@@ -1628,7 +1633,7 @@ declare class FirstRunWizard implements PageObject {
     readonly toolsSelector: Locator;
     readonly recommendationHeader: Locator;
     readonly toolsRecommendedPlugin: Locator;
-    constructor(page: Page);
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     url(): string;
 }
 

package/dist/index.mjs

@@ -3,6 +3,7 @@ export * from '@playwright/test';
 import { Image } from 'image-js';
 import crypto from 'crypto';
 import { stringify } from 'uuid';
+import { satisfies } from 'compare-versions';
 import fs from 'fs';
 import { AxeBuilder } from '@axe-core/playwright';
 import { createHtmlReport } from 'axe-html-reporter';
@@ -2997,9 +2998,19 @@ const test$7 = test$e.extend({
       const response = await context.get("./_info/config");
       expect(response.ok(), "/_info/config request failed").toBeTruthy();
       const config = await response.json();
+      const features = {};
+      if (satisfies(config.version, ">=6.6.0.0")) {
+        const featuresResponse = await context.get("./_action/feature-flag");
+        expect(featuresResponse.ok(), "/_action/feature-flag request failed").toBeTruthy();
+        const data = await featuresResponse.json();
+        for (const k in data) {
+          features[k] = data[k].active;
+        }
+      }
       use({
         version: config.version,
-        isSaaS: await isSaaSInstance(context)
+        isSaaS: await isSaaSInstance(context),
+        features
       });
     },
     { scope: "worker" }
@@ -3377,8 +3388,9 @@ var __publicField$G = (obj, key, value) => {
   return value;
 };
 class Account {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$G(this, "headline");
     __publicField$G(this, "personalDataCardTitle");
     __publicField$G(this, "paymentMethodCardTitle");
@@ -3394,7 +3406,11 @@ class Account {
     this.shippingAddressCardTitle = page.getByRole("heading", { name: "Default shipping address" });
     this.newsletterCheckbox = page.getByLabel("Yes, I would like to");
     this.newsletterRegistrationSuccessMessage = page.getByText("You have successfully subscribed to the newsletter.");
-    this.customerGroupRequestMessage = page.locator(".alert-content");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.customerGroupRequestMessage = page.locator(".alert-content");
+    } else {
+      this.customerGroupRequestMessage = page.locator(".alert-content-container");
+    }
   }
   async getCustomerGroupAlert(customerGroup) {
     return this.customerGroupRequestMessage.getByText(`Access to customer group "${customerGroup}" requested.`);
@@ -3806,8 +3822,8 @@ const test$6 = test$e.extend({
   StorefrontCheckoutRegister: async ({ StorefrontPage }, use) => {
     await use(new CheckoutRegister(StorefrontPage));
   },
-  StorefrontAccount: async ({ StorefrontPage }, use) => {
-    await use(new Account(StorefrontPage));
+  StorefrontAccount: async ({ StorefrontPage, InstanceMeta }, use) => {
+    await use(new Account(StorefrontPage, InstanceMeta));
   },
   StorefrontAccountLogin: async ({ StorefrontPage }, use) => {
     await use(new AccountLogin(StorefrontPage));
@@ -3924,7 +3940,7 @@ class ProductDetail {
     this.activeForAllSalesChannelsToggle = page.locator(".sw-field--product-active").getByRole("checkbox");
     this.tagsInput = page.locator(".sw-product-category-form__tag-field");
     this.saleChannelsInput = page.locator(".sw-product-detail__select-visibility");
-    this.releaseDateInput = page.locator(".sw-block-field", { hasText: "Release Date" }).getByPlaceholder("Enter release date...").last();
+    this.releaseDateInput = page.locator(".sw-product-detail-base__labelling-card").locator(".form-control");
     this.uploadMediaButton = page.getByRole("button", { name: "Upload file" });
     this.coverImage = page.locator(".sw-product-media-form__cover-image");
     this.productImage = page.locator(".sw-media-preview-v2__item");
@@ -4066,8 +4082,9 @@ var __publicField$t = (obj, key, value) => {
   return value;
 };
 class CustomerDetail {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$t(this, "editButton");
     __publicField$t(this, "generalTab");
     __publicField$t(this, "accountCard");
@@ -4085,7 +4102,11 @@ class CustomerDetail {
     this.customFieldCard = page.locator(".sw-card").getByText("Custom fields");
     this.customFieldSetTabs = this.customFieldCard.locator(".sw-tabs-item");
     this.customFieldSetTabCustomContent = this.customFieldCard.locator(".sw-tabs__custom-content");
-    this.customerGroupRequestMessage = page.locator(".sw-alert__message");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.customerGroupRequestMessage = page.locator(".sw-alert__message");
+    } else {
+      this.customerGroupRequestMessage = page.locator(".mt-banner__message");
+    }
     this.customerGroupAcceptButton = page.getByRole("button", { name: "Accept" });
     this.customerGroupDeclineButton = page.getByRole("button", { name: "Decline" });
     this.tagList = page.locator(".sw-customer-card__tag-select").locator(".sw-select-selection-list");
@@ -4232,8 +4253,9 @@ var __publicField$p = (obj, key, value) => {
   return value;
 };
 class FirstRunWizard {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     __publicField$p(this, "nextButton");
     __publicField$p(this, "configureLaterButton");
     __publicField$p(this, "skipButton");
@@ -4286,7 +4308,11 @@ class FirstRunWizard {
     this.dataImportCard = page.locator(".sw-first-run-wizard-data-import__card");
     this.defaultValuesHeader = page.locator(".sw-modal__title", { hasText: "Setup default values" });
     this.salesChannelSelectionMultiSelect = page.getByPlaceholder("Select Sales Channels...");
-    this.salesChannelSelectionList = page.locator(".sw-popover__wrapper").getByRole("listitem");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.salesChannelSelectionList = page.locator(".sw-popover__wrapper").getByRole("listitem");
+    } else {
+      this.salesChannelSelectionList = page.locator(".sw-select-result-list-popover").getByRole("listitem");
+    }
     this.mailerConfigurationHeader = page.locator(".sw-modal__title", { hasText: "Mailer configuration" });
     this.smtpServerButton = page.getByText("Configure own SMTP server", { exact: true });
     this.smtpServerTitle = page.getByText("SMTP server", { exact: true });
@@ -5244,14 +5270,14 @@ class ProductBulkEdit {
     this.changeManufacturerRow = page.locator(".sw-bulk-edit-change-field-manufacturerId");
     this.changeManufacturerCheckbox = this.changeManufacturerRow.getByRole("checkbox");
     this.manufacturerDropdown = this.changeManufacturerRow.locator(".sw-select__selection");
-    this.manufacturerDropdownInput = this.changeManufacturerRow.getByPlaceholder("Select manufacturer...");
+    this.manufacturerDropdownInput = this.changeManufacturerRow.locator(".sw-entity-single-select__selection-input");
     this.manufacturerListResult = this.changeManufacturerRow.getByRole("list");
     this.changeActiveRow = page.locator(".sw-bulk-edit-change-field-active");
     this.changeActiveCheckbox = this.changeActiveRow.getByRole("checkbox").first();
     this.activeToggle = this.changeActiveRow.getByRole("checkbox").last();
     this.changePriceRow = page.locator(".sw-bulk-edit-change-field-price");
     this.changePriceCheckbox = this.changePriceRow.getByRole("checkbox");
-    this.grossPriceInput = this.changePriceRow.getByPlaceholder("Enter gross price...");
+    this.grossPriceInput = this.changePriceRow.locator("#price-gross");
     this.changeReleaseDateRow = page.locator(".sw-bulk-edit-change-field-releaseDate");
     this.changeReleaseDateCheckbox = this.changeReleaseDateRow.getByRole("checkbox");
     this.releaseDateInput = this.changeReleaseDateRow.getByRole("textbox").last();
@@ -5259,17 +5285,17 @@ class ProductBulkEdit {
     this.changeStockCheckbox = this.changeStockRow.getByRole("checkbox");
     this.stockChangeMethodDropdown = this.changeStockRow.locator(".sw-single-select__selection-text");
     this.stockChangeMethodInput = this.changeStockRow.locator(".sw-single-select__selection-input");
-    this.stockInput = this.changeStockRow.getByPlaceholder("Enter quantity in stock...");
+    this.stockInput = this.changeStockRow.locator("#stock");
     this.changeRestockTimeRow = page.locator(".sw-bulk-edit-change-field-restockTime");
     this.changeRestockTimeCheckbox = this.changeRestockTimeRow.getByRole("checkbox");
     this.restockTimeChangeMethodDropdown = this.changeRestockTimeRow.locator(".sw-single-select__selection-text");
     this.restockTimeChangeMethodInput = this.changeRestockTimeRow.locator(".sw-single-select__selection-input");
-    this.restockTimeInput = this.changeRestockTimeRow.getByPlaceholder("Enter restock time in days...");
+    this.restockTimeInput = this.changeRestockTimeRow.locator("#restock-time");
     this.changeTagsRow = page.locator(".sw-bulk-edit-change-field-tags");
     this.changeTagsCheckbox = this.changeTagsRow.getByRole("checkbox");
     this.tagsChangeMethodDropdown = this.changeTagsRow.locator(".sw-single-select__selection-text");
     this.tagsChangeMethodInput = this.changeTagsRow.locator(".sw-single-select__selection-input");
-    this.tagsInput = this.changeTagsRow.getByPlaceholder("Enter tags...");
+    this.tagsInput = this.changeTagsRow.locator(".sw-select-selection-list__input");
     this.changeSalesChannelRow = page.locator(".sw-bulk-edit-change-field-visibilities");
     this.changeSalesChannelCheckbox = this.changeSalesChannelRow.getByRole("checkbox");
     this.salesChannelChangeMethodDropdown = this.changeSalesChannelRow.locator(".sw-single-select__selection-text");
@@ -5411,8 +5437,8 @@ const test$5 = test$e.extend({
   AdminCustomerListing: async ({ AdminPage }, use) => {
     await use(new CustomerListing(AdminPage));
   },
-  AdminCustomerDetail: async ({ AdminPage }, use) => {
-    await use(new CustomerDetail(AdminPage));
+  AdminCustomerDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new CustomerDetail(AdminPage, InstanceMeta));
   },
   AdminCustomerGroupListing: async ({ AdminPage }, use) => {
     await use(new CustomerGroupListing(AdminPage));
@@ -5423,8 +5449,8 @@ const test$5 = test$e.extend({
   AdminCustomerGroupDetail: async ({ AdminPage }, use) => {
     await use(new CustomerGroupDetail(AdminPage));
   },
-  AdminFirstRunWizard: async ({ AdminPage }, use) => {
-    await use(new FirstRunWizard(AdminPage));
+  AdminFirstRunWizard: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new FirstRunWizard(AdminPage, InstanceMeta));
   },
   AdminFlowBuilderCreate: async ({ AdminPage }, use) => {
     await use(new FlowBuilderCreate(AdminPage));
@@ -6166,6 +6192,7 @@ const BulkEditProducts = test$e.extend({
         if (changes["releaseDate"] != null) {
           await AdminProductBulkEdit.changeReleaseDateCheckbox.click();
           await AdminProductBulkEdit.releaseDateInput.fill(changes["releaseDate"].value);
+          await AdminProductBulkEdit.releaseDateInput.press("Enter");
         }
         if (changes["stock"] != null) {
           await AdminProductBulkEdit.changeStockCheckbox.click();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/acceptance-test-suite",
-  "version": "11.0.0",
+  "version": "11.1.1",
   "description": "Shopware Acceptance Test Suite",
   "author": "shopware AG",
   "license": "MIT",
@@ -40,6 +40,7 @@
     "@playwright/test": "^1.49.1",
     "@shopware/api-client": "0.5.0",
     "axe-html-reporter": "2.2.3",
+    "compare-versions": "^6.1.1",
     "image-js": "0.35.5",
     "uuid": "9.0.1"
   },