@shopware-ag/acceptance-test-suite 10.2.3 → 11.1.0

package/dist/index.d.mts

@@ -373,8 +373,10 @@ declare enum RuleType {
     promotionCart = "promotionCartRule"
 }
 interface RuleAssignmentEntity {
-    id: string;
-    name: string;
+    entity: {
+        id: string;
+        name: string;
+    };
     ruleType: RuleType;
 }
 interface CategoryData {
@@ -467,6 +469,7 @@ declare class TestDataService {
      * @private
      */
     private createdRecords;
+    private restoreSystemConfig;
     /**
      * A registry of all created sales channel records.
      *
@@ -655,13 +658,11 @@ declare class TestDataService {
      */
     createCustomerGroup(overrides?: Partial<CustomerGroup>): Promise<CustomerGroup>;
     /**
-     * Creates a system config entry
+     * Set system config for default sales channel
      *
-     * @param configurationKey - Config key for shop configurations.
-     * @param configurationValue - Config value as object for shop configurations (see {@link https://shopware.stoplight.io/docs/admin-api/9174d032146f8-create-a-new-system-config-resources|AdminApi Stoplight}).
-     * @param salesChannelId - Unique identity of sales channel.
+     * @param configs - Key value pairs to set
      */
-    createSystemConfigEntry(configurationKey: string, configurationValue?: {}, salesChannelId?: string): Promise<SystemConfig>;
+    setSystemConfig(configs: Record<string, unknown>): Promise<void>;
     /**
      * Creates a random sales channel analytics entity
      *
@@ -1043,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;
     };
 }
 
@@ -1244,6 +1247,7 @@ declare class AccountLogin implements PageObject {
     readonly logoutLink: Locator;
     readonly successAlert: Locator;
     readonly invalidCredentialsAlert: Locator;
+    readonly passwordUpdatedAlert: Locator;
     readonly personalFormArea: Locator;
     readonly billingAddressFormArea: Locator;
     readonly accountTypeSelect: Locator;
@@ -1273,8 +1277,12 @@ declare class AccountRecover implements PageObject {
     readonly requestEmailButton: Locator;
     readonly backButton: Locator;
     readonly passwordResetEmailSentMessage: Locator;
+    readonly newPasswordInput: Locator;
+    readonly newPasswordConfirmInput: Locator;
+    readonly changePasswordButton: Locator;
+    readonly invalidLinkMessage: Locator;
     constructor(page: Page);
-    url(): string;
+    url(recoverLink?: string): string;
 }
 
 declare class AccountProfile implements PageObject {
@@ -2225,8 +2233,6 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ExpectNotification: Task;
 } & {
     CreateLinkTypeCategory: Task;
-} & {
-    SetSystemConfigValues: Task;
 } & {
     BulkEditProducts: Task;
 } & {

package/dist/index.d.ts

@@ -373,8 +373,10 @@ declare enum RuleType {
     promotionCart = "promotionCartRule"
 }
 interface RuleAssignmentEntity {
-    id: string;
-    name: string;
+    entity: {
+        id: string;
+        name: string;
+    };
     ruleType: RuleType;
 }
 interface CategoryData {
@@ -467,6 +469,7 @@ declare class TestDataService {
      * @private
      */
     private createdRecords;
+    private restoreSystemConfig;
     /**
      * A registry of all created sales channel records.
      *
@@ -655,13 +658,11 @@ declare class TestDataService {
      */
     createCustomerGroup(overrides?: Partial<CustomerGroup>): Promise<CustomerGroup>;
     /**
-     * Creates a system config entry
+     * Set system config for default sales channel
      *
-     * @param configurationKey - Config key for shop configurations.
-     * @param configurationValue - Config value as object for shop configurations (see {@link https://shopware.stoplight.io/docs/admin-api/9174d032146f8-create-a-new-system-config-resources|AdminApi Stoplight}).
-     * @param salesChannelId - Unique identity of sales channel.
+     * @param configs - Key value pairs to set
      */
-    createSystemConfigEntry(configurationKey: string, configurationValue?: {}, salesChannelId?: string): Promise<SystemConfig>;
+    setSystemConfig(configs: Record<string, unknown>): Promise<void>;
     /**
      * Creates a random sales channel analytics entity
      *
@@ -1043,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;
     };
 }
 
@@ -1244,6 +1247,7 @@ declare class AccountLogin implements PageObject {
     readonly logoutLink: Locator;
     readonly successAlert: Locator;
     readonly invalidCredentialsAlert: Locator;
+    readonly passwordUpdatedAlert: Locator;
     readonly personalFormArea: Locator;
     readonly billingAddressFormArea: Locator;
     readonly accountTypeSelect: Locator;
@@ -1273,8 +1277,12 @@ declare class AccountRecover implements PageObject {
     readonly requestEmailButton: Locator;
     readonly backButton: Locator;
     readonly passwordResetEmailSentMessage: Locator;
+    readonly newPasswordInput: Locator;
+    readonly newPasswordConfirmInput: Locator;
+    readonly changePasswordButton: Locator;
+    readonly invalidLinkMessage: Locator;
     constructor(page: Page);
-    url(): string;
+    url(recoverLink?: string): string;
 }
 
 declare class AccountProfile implements PageObject {
@@ -2225,8 +2233,6 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ExpectNotification: Task;
 } & {
     CreateLinkTypeCategory: Task;
-} & {
-    SetSystemConfigValues: Task;
 } & {
     BulkEditProducts: Task;
 } & {

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';
@@ -973,6 +974,7 @@ class TestDataService {
      * @private
      */
     __publicField$Q(this, "createdRecords", []);
+    __publicField$Q(this, "restoreSystemConfig", {});
     /**
      * A registry of all created sales channel records.
      *
@@ -1526,27 +1528,19 @@ class TestDataService {
     return customerGroup;
   }
   /**
-   * Creates a system config entry
+   * Set system config for default sales channel
    *
-   * @param configurationKey - Config key for shop configurations.
-   * @param configurationValue - Config value as object for shop configurations (see {@link https://shopware.stoplight.io/docs/admin-api/9174d032146f8-create-a-new-system-config-resources|AdminApi Stoplight}).
-   * @param salesChannelId - Unique identity of sales channel.
+   * @param configs - Key value pairs to set
    */
-  async createSystemConfigEntry(configurationKey, configurationValue = {}, salesChannelId = "") {
-    const systemConfigStruct = {
-      id: this.IdProvider.getIdPair().uuid,
-      configurationKey,
-      configurationValue,
-      salesChannelId: salesChannelId || null
-    };
-    const response = await this.AdminApiClient.post("system-config?_response=detail", {
-      data: systemConfigStruct
+  async setSystemConfig(configs) {
+    const response = await this.AdminApiClient.post(`_action/system-config?_response=detail&salesChannelId=${this.defaultSalesChannel.id}`, {
+      data: configs
     });
     expect(response.ok()).toBeTruthy();
-    const { data: systemConfigEntry } = await response.json();
-    this.addCreatedRecord("system_config", systemConfigEntry.id);
+    for (const key of Object.keys(configs)) {
+      this.restoreSystemConfig[key] = null;
+    }
     await this.clearCaches();
-    return systemConfigEntry;
   }
   /**
    * Creates a random sales channel analytics entity
@@ -2219,7 +2213,11 @@ class TestDataService {
     await this.AdminApiClient.post("_action/sync", {
       data: priorityDeleteOperations
     });
-    return await this.AdminApiClient.post("_action/sync", {
+    await this.AdminApiClient.post(`_action/system-config?_response=detail&salesChannelId=${this.defaultSalesChannel.id}`, {
+      data: this.restoreSystemConfig
+    });
+    await this.clearCaches();
+    return this.AdminApiClient.post("_action/sync", {
       data: deleteOperations
     });
   }
@@ -3000,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" }
@@ -3423,6 +3431,7 @@ class AccountLogin {
     __publicField$F(this, "logoutLink");
     __publicField$F(this, "successAlert");
     __publicField$F(this, "invalidCredentialsAlert");
+    __publicField$F(this, "passwordUpdatedAlert");
     // Inputs for registration
     __publicField$F(this, "personalFormArea");
     __publicField$F(this, "billingAddressFormArea");
@@ -3464,6 +3473,7 @@ class AccountLogin {
     this.registerButton = page.getByRole("button", { name: "Continue" });
     this.logoutLink = page.getByRole("link", { name: "Log out" });
     this.successAlert = page.getByText("Successfully logged out.");
+    this.passwordUpdatedAlert = page.getByText("Your password has been updated.");
   }
   url() {
     return "account/login";
@@ -3486,6 +3496,10 @@ class AccountRecover {
     __publicField$E(this, "requestEmailButton");
     __publicField$E(this, "backButton");
     __publicField$E(this, "passwordResetEmailSentMessage");
+    __publicField$E(this, "newPasswordInput");
+    __publicField$E(this, "newPasswordConfirmInput");
+    __publicField$E(this, "changePasswordButton");
+    __publicField$E(this, "invalidLinkMessage");
     this.passwordRecoveryForm = page.locator(".account-recover-password-form");
     const cardTitle = this.passwordRecoveryForm.locator(".card-title");
     this.title = cardTitle.getByText("Password recovery");
@@ -3494,8 +3508,15 @@ class AccountRecover {
     this.requestEmailButton = this.passwordRecoveryForm.getByRole("button", { name: "Request email" });
     this.backButton = this.passwordRecoveryForm.getByRole("link", { name: "Back" });
     this.passwordResetEmailSentMessage = page.getByText("If the provided email address is registered, a confirmation email including a password reset link has been sent.");
+    this.newPasswordInput = page.getByLabel("New password");
+    this.newPasswordConfirmInput = page.getByLabel("Password confirmation");
+    this.changePasswordButton = page.getByRole("button", { name: "Change password" });
+    this.invalidLinkMessage = page.getByText("The password reset link seems to be invalid.");
   }
-  url() {
+  url(recoverLink) {
+    if (recoverLink) {
+      return recoverLink;
+    }
     return "account/recover";
   }
 }
@@ -6119,33 +6140,6 @@ const CreateLinkTypeCategory = test$e.extend({
   }
 });
 
-const SetSystemConfigValues = test$e.extend({
-  SetSystemConfigValues: async ({ AdminApiContext, DefaultSalesChannel, TestDataService }, use) => {
-    let defaultSettings;
-    const task = (newValues, defaultValues) => {
-      return async function LoginRegistration() {
-        defaultSettings = defaultValues;
-        const newSettings = await AdminApiContext.post("./_action/system-config/batch", {
-          data: {
-            null: newValues,
-            [DefaultSalesChannel.salesChannel.id]: {}
-          }
-        });
-        expect(newSettings.ok()).toBeTruthy();
-        await TestDataService.clearCaches();
-      };
-    };
-    await use(task);
-    const revertSettings = await AdminApiContext.post(`./_action/system-config/batch`, {
-      data: {
-        null: defaultSettings,
-        [DefaultSalesChannel.salesChannel.id]: {}
-      }
-    });
-    expect(revertSettings.ok()).toBeTruthy();
-  }
-});
-
 const BulkEditProducts = test$e.extend({
   BulkEditProducts: async ({ AdminProductBulkEdit, AdminProductListing }, use) => {
     const task = (products, changes) => {
@@ -6334,28 +6328,28 @@ const AssignEntitiesToRule = test$e.extend({
           await AdminRuleDetail.page.locator(".sw-data-grid__row").filter({ hasText: entityName }).getByRole("checkbox").click();
           await AdminRuleDetail.page.locator(".sw-button--primary").getByText("Add").click();
         }
-        for (const entity of assignableEntities) {
-          switch (entity.ruleType) {
+        for (const assignableEntity of assignableEntities) {
+          switch (assignableEntity.ruleType) {
             case RuleType.shippingAvailability:
-              await entityAssignment(entity.name, AdminRuleDetail.shippingMethodAvailabilityRulesCard);
+              await entityAssignment(assignableEntity.entity.name, AdminRuleDetail.shippingMethodAvailabilityRulesCard);
               break;
             case RuleType.taxAvailability:
-              await entityAssignment(entity.name, AdminRuleDetail.taxProviderRulesCard);
+              await entityAssignment(assignableEntity.entity.name, AdminRuleDetail.taxProviderRulesCard);
               break;
             case RuleType.paymentAvailability:
-              await entityAssignment(entity.name, AdminRuleDetail.paymentMethodsAvailabilityRulesCard);
+              await entityAssignment(assignableEntity.entity.name, AdminRuleDetail.paymentMethodsAvailabilityRulesCard);
               break;
             case RuleType.promotionOrder:
-              await entityAssignment(entity.name, AdminRuleDetail.promotionOrderRulesCard);
+              await entityAssignment(assignableEntity.entity.name, AdminRuleDetail.promotionOrderRulesCard);
               break;
             case RuleType.promotionCustomer:
-              await entityAssignment(entity.name, AdminRuleDetail.promotionCustomerRulesCard);
+              await entityAssignment(assignableEntity.entity.name, AdminRuleDetail.promotionCustomerRulesCard);
               break;
             case RuleType.promotionCart:
-              await entityAssignment(entity.name, AdminRuleDetail.promotionCartRulesCard);
+              await entityAssignment(assignableEntity.entity.name, AdminRuleDetail.promotionCartRulesCard);
               break;
             default:
-              throw new Error(`Unknown rule type "${entity.ruleType}". Valid rule types: "${Object.values(RuleType).join('", "')}".`);
+              throw new Error(`Unknown rule type "${assignableEntity.ruleType}". Valid rule types: "${Object.values(RuleType).join('", "')}".`);
           }
         }
       };
@@ -6368,7 +6362,6 @@ const test$3 = mergeTests(
   SaveProduct,
   ExpectNotification,
   CreateLinkTypeCategory,
-  SetSystemConfigValues,
   BulkEditProducts,
   BulkEditCustomers,
   AssignEntitiesToRule

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/acceptance-test-suite",
-  "version": "10.2.3",
+  "version": "11.1.0",
   "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"
   },