@shopware-ag/acceptance-test-suite 11.11.1 → 11.12.1

package/dist/index.d.mts

@@ -146,10 +146,11 @@ interface PageContextTypes {
 declare class Actor {
     page: Page;
     readonly name: string;
-    constructor(name: string, page: Page);
+    baseURL: string | undefined;
+    constructor(name: string, page: Page, baseURL?: string);
     expects: _playwright_test.Expect<{}>;
     attemptsTo(task: () => Promise<void>): Promise<void>;
-    goesTo(url: string): Promise<void>;
+    goesTo(url: string, forceReload?: boolean): Promise<void>;
     private camelCaseToLowerCase;
 }
 
@@ -1919,6 +1920,7 @@ declare class FlowBuilderCreate implements PageObject {
     readonly page: Page;
     readonly saveButton: Locator;
     readonly header: Locator;
+    readonly newFlowHeader: Locator;
     constructor(page: Page);
     url(): string;
 }
@@ -2071,6 +2073,7 @@ declare class LandingPageDetail implements PageObject {
 
 declare class Categories implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     /**
      * Landing pages
      */
@@ -2108,7 +2111,9 @@ declare class Categories implements PageObject {
     readonly filterResultPopoverTreeCheckboxItemList: Locator;
     readonly openInNewTabCheckbox: Locator;
     readonly popoverCategoryTree: Locator;
-    constructor(page: Page);
+    readonly categorySelectionListWrapper: Locator;
+    readonly productSelectionInput: Locator;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getLandingPageByName(landingPageName: string): Promise<Locator>;
     getPopOverCategoryByName(categoryName: string): Promise<Locator>;
     getTreeItemContextButton(name: string): Locator;

package/dist/index.d.ts

@@ -146,10 +146,11 @@ interface PageContextTypes {
 declare class Actor {
     page: Page;
     readonly name: string;
-    constructor(name: string, page: Page);
+    baseURL: string | undefined;
+    constructor(name: string, page: Page, baseURL?: string);
     expects: _playwright_test.Expect<{}>;
     attemptsTo(task: () => Promise<void>): Promise<void>;
-    goesTo(url: string): Promise<void>;
+    goesTo(url: string, forceReload?: boolean): Promise<void>;
     private camelCaseToLowerCase;
 }
 
@@ -1919,6 +1920,7 @@ declare class FlowBuilderCreate implements PageObject {
     readonly page: Page;
     readonly saveButton: Locator;
     readonly header: Locator;
+    readonly newFlowHeader: Locator;
     constructor(page: Page);
     url(): string;
 }
@@ -2071,6 +2073,7 @@ declare class LandingPageDetail implements PageObject {
 
 declare class Categories implements PageObject {
     readonly page: Page;
+    readonly instanceMeta: HelperFixtureTypes['InstanceMeta'];
     /**
      * Landing pages
      */
@@ -2108,7 +2111,9 @@ declare class Categories implements PageObject {
     readonly filterResultPopoverTreeCheckboxItemList: Locator;
     readonly openInNewTabCheckbox: Locator;
     readonly popoverCategoryTree: Locator;
-    constructor(page: Page);
+    readonly categorySelectionListWrapper: Locator;
+    readonly productSelectionInput: Locator;
+    constructor(page: Page, instanceMeta: HelperFixtureTypes['InstanceMeta']);
     getLandingPageByName(landingPageName: string): Promise<Locator>;
     getPopOverCategoryByName(categoryName: string): Promise<Locator>;
     getTreeItemContextButton(name: string): Locator;

package/dist/index.mjs

@@ -633,6 +633,11 @@ const test$b = test$f.extend({
       return res;
     };
     await clearDelayedCache(AdminApiContext);
+    await expect(page.locator(".sw-skeleton")).toHaveCount(0);
+    await page.waitForURL((url) => {
+      return url.hash !== "#login";
+    });
+    await expect(page.getByText("Administration").first()).toBeVisible();
     await use(page);
     await page.close();
     await context.close();
@@ -689,31 +694,41 @@ var __publicField$V = (obj, key, value) => {
   return value;
 };
 class Actor {
-  constructor(name, page) {
+  constructor(name, page, baseURL) {
     __publicField$V(this, "page");
     __publicField$V(this, "name");
+    __publicField$V(this, "baseURL");
     __publicField$V(this, "expects", expect);
     this.name = name;
     this.page = page;
+    this.baseURL = baseURL;
   }
   async attemptsTo(task) {
     const stepTitle = `${this.name} attempts to ${this.camelCaseToLowerCase(task.name)}`;
     await test$f.step(stepTitle, async () => await task());
   }
-  async goesTo(url) {
+  async goesTo(url, forceReload = false) {
     const stepTitle = `${this.name} navigates to "${url}"`;
     await test$f.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()
-      });
+      if (this.baseURL && !forceReload && url.startsWith("#")) {
+        const baseURLWithoutSlash = this.baseURL.charAt(this.baseURL.length - 1) == "/" ? this.baseURL.substr(0, this.baseURL.length - 1) : this.baseURL;
+        const fullURL = new URL(url, baseURLWithoutSlash);
+        await this.page.evaluate(`document.location = "${url}";`);
+        await this.page.waitForURL(`${fullURL.toString()}**`, { timeout: 15e3 });
+        await expect(this.page.locator(".sw-skeleton")).toHaveCount(0);
+      } else {
+        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) {
@@ -726,8 +741,8 @@ const test$a = test$f.extend({
     const shopCustomer = new Actor("Shop customer", StorefrontPage);
     await use(shopCustomer);
   },
-  ShopAdmin: async ({ AdminPage }, use) => {
-    const shopAdmin = new Actor("Shop administrator", AdminPage);
+  ShopAdmin: async ({ AdminPage, SalesChannelBaseConfig }, use) => {
+    const shopAdmin = new Actor("Shop administrator", AdminPage, SalesChannelBaseConfig.adminUrl);
     await use(shopAdmin);
   }
 });
@@ -3052,7 +3067,7 @@ class TestDataService {
     return Object.assign({}, basicSalesChannelAnalyticsStruct, overrides);
   }
   async clearCaches() {
-    await this.AdminApiClient.delete("_action/cache");
+    await clearDelayedCache(this.AdminApiClient);
   }
   getBasicCustomFieldSetStruct(overrides = {}) {
     const customFieldSetUuid = this.IdProvider.getIdPair().uuid;
@@ -5053,8 +5068,10 @@ class FlowBuilderCreate {
     this.page = page;
     __publicField$o(this, "saveButton");
     __publicField$o(this, "header");
+    __publicField$o(this, "newFlowHeader");
     this.saveButton = page.locator(".sw-flow-detail__save");
     this.header = page.locator("h2");
+    this.newFlowHeader = page.getByRole("heading", { name: "New flow" });
   }
   url() {
     return "#/sw/flow/create/general";
@@ -5404,8 +5421,9 @@ var __publicField$e = (obj, key, value) => {
   return value;
 };
 class Categories {
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
+    this.instanceMeta = instanceMeta;
     /**
      * Landing pages
      */
@@ -5443,6 +5461,8 @@ class Categories {
     __publicField$e(this, "filterResultPopoverTreeCheckboxItemList");
     __publicField$e(this, "openInNewTabCheckbox");
     __publicField$e(this, "popoverCategoryTree");
+    __publicField$e(this, "categorySelectionListWrapper");
+    __publicField$e(this, "productSelectionInput");
     this.landingPageArea = page.locator(".sw-category-detail__landing-page-collapse");
     this.landingPageHeadline = this.landingPageArea.getByRole("heading", { name: "Landing pages" });
     this.addLandingPageButton = this.landingPageArea.getByText("Add landing page");
@@ -5459,14 +5479,21 @@ class Categories {
     this.categoryTypeSelectionList = page.locator(".sw-select").filter({ hasText: "Category type" }).locator(".sw-select__selection");
     this.linkTypeSelectionList = page.locator(".sw-select").filter({ hasText: "Link type" }).locator(".sw-select__selection");
     this.entitySelectionList = page.locator(".sw-select").filter({ hasText: "Entity" }).locator(".sw-select__selection");
-    this.categorySelectionList = page.locator(".sw-category-link-settings__selection-category");
+    if (satisfies(instanceMeta.version, "<6.7")) {
+      this.categorySelectionList = page.locator(".sw-category-link-settings__selection-category");
+    } else {
+      this.categorySelectionList = page.locator(".sw-category-tree__input-field");
+    }
+    this.categorySelectionListWrapper = page.locator(".sw-category-tree-field__main-wrapper");
     this.productSelectionList = page.locator(".sw-category-link-settings__selection-product");
+    this.productSelectionInput = this.productSelectionList.locator(".sw-entity-single-select__selection-input");
     this.landingPageSelectionList = page.locator(".sw-category-link-settings__selection-landing-page");
     this.filtersResultPopoverItemList = page.locator(".sw-select-result-list__content").getByRole("listitem");
     this.popoverCategoryTree = page.locator(".sw-category-tree-field__results_popover");
     this.filterResultPopoverTreeCheckboxItemList = this.popoverCategoryTree.locator(".sw-tree__content").locator(".sw-tree-item");
     this.openInNewTabCheckbox = page.getByRole("checkbox", { name: "Open in new tab" });
     this.loadingSpinner = page.locator(".sw-loader");
+    this.loadingSpinner = page.locator(".mt-loader");
     this.fadingBar = page.locator(".fade-leave-active");
   }
   async getLandingPageByName(landingPageName) {
@@ -6248,8 +6275,8 @@ const test$6 = test$f.extend({
   AdminPaymentDetail: async ({ AdminPage }, use) => {
     await use(new PaymentDetail(AdminPage));
   },
-  AdminCategories: async ({ AdminPage }, use) => {
-    await use(new Categories(AdminPage));
+  AdminCategories: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new Categories(AdminPage, InstanceMeta));
   },
   AdminCategoryDetail: async ({ AdminPage, InstanceMeta }, use) => {
     await use(new CategoryDetail(AdminPage, InstanceMeta));
@@ -6906,6 +6933,9 @@ const CreateLinkTypeCategory = test$f.extend({
             break;
           case "Product":
             await AdminCategories.productSelectionList.click();
+            if (categoryCustomizableLinkData.product != null) {
+              await AdminCategories.productSelectionInput.fill(categoryCustomizableLinkData.product);
+            }
             await AdminCategories.filtersResultPopoverItemList.filter({ hasText: categoryCustomizableLinkData.product }).click();
             break;
           case "Landing page":

package/package.json

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