@shopware-ag/acceptance-test-suite 11.33.1 → 11.34.0

package/dist/index.d.mts

@@ -763,7 +763,7 @@ declare class TestDataService {
      * @param productId - The uuid of the product.
      * @param manufacturerId - The uuid of the manufacturer.
      */
-    assignProductManufacturer(productId: string, manufacturerId: string): Promise<void>;
+    assignProductManufacturer(productId: string, manufacturerId: string): Promise<any>;
     /**
      * Assigns a country to a currency with default roundings of 2.
      *
@@ -778,14 +778,14 @@ declare class TestDataService {
      * @param productId - The uuid of the product.
      * @param categoryId - The uuid of the category.
      */
-    assignProductCategory(productId: string, categoryId: string): Promise<playwright_core.APIResponse>;
+    assignProductCategory(productId: string, categoryId: string): Promise<any>;
     /**
      * Assigns a tag to a product.
      *
      * @param productId - The uuid of the product.
      * @param tagId - The uuid of the tag.
      */
-    assignProductTag(productId: string, tagId: string): Promise<playwright_core.APIResponse>;
+    assignProductTag(productId: string, tagId: string): Promise<any>;
     /**
      * Assigns a media resource to a manufacturer as a logo.
      *
@@ -1011,6 +1011,14 @@ declare class TestDataService {
      * @param array
      */
     combineAll: (array: Record<string, string>[][]) => Record<string, string>[][];
+    /**
+     * Generates a random alphanumeric string of a specified length.
+     * Ensures at least one numeric character is included.
+     *
+     * @param length - The desired length of the random string (default: 3)
+     * @returns A random alphanumeric string containing at least one digit
+     */
+    generateRandomId(length?: number): string;
     /**
      * @deprecated Use `getCountry` instead.
      * Retrieves a country Id based on its iso2 code.
@@ -5082,6 +5090,17 @@ declare class ListingPageLayoutDetail implements PageObject {
     url(layoutId: string): string;
 }
 
+declare class SalesChannelDetail implements PageObject {
+    readonly page: Page$1;
+    readonly generalTabLink: Locator$1;
+    readonly productsTabLink: Locator$1;
+    readonly themeTabLink: Locator$1;
+    readonly analyticsTabLink: Locator$1;
+    readonly addDomainButton: Locator$1;
+    constructor(page: Page$1);
+    url(salesChannelId: string): string;
+}
+
 interface AdministrationPageTypes {
     AdminProductDetail: ProductDetail$1;
     AdminOrderDetail: OrderDetail;
@@ -5122,6 +5141,7 @@ interface AdministrationPageTypes {
     AdminPromotionsListing: PromotionsListing;
     AdminPromotionCreate: PromotionCreate;
     AdminPromotionDetail: PromotionDetail;
+    AdminSalesChannelDetail: SalesChannelDetail;
     AdminShopwareServices: ShopwareServices;
     AdminMedia: Media;
     AdminYourProfile: YourProfile;
@@ -5169,6 +5189,7 @@ declare const AdminPageObjects: {
     SettingsListing: typeof SettingsListing;
     DocumentListing: typeof DocumentListing;
     DocumentDetail: typeof DocumentDetail;
+    SalesChannelDetail: typeof SalesChannelDetail;
     ShopwareServices: typeof ShopwareServices;
     PromotionsListing: typeof PromotionsListing;
     PromotionCreate: typeof PromotionCreate;
@@ -5438,7 +5459,7 @@ declare class CheckoutFinish implements PageObject {
     constructor(page: Page);
     url(): string;
     getOrderNumber(): Promise<string | null>;
-    getOrderId(): string | null;
+    getOrderId(): string;
 }
 
 declare class CheckoutRegister implements PageObject {
@@ -5900,6 +5921,8 @@ declare const test: playwright_test.TestType<playwright_test.PlaywrightTestArgs
     AddProductToWishlist: Task;
 } & {
     SelectProductFilterOption: Task;
+} & {
+    CheckVisibilityInHome: Task;
 }, playwright_test.PlaywrightWorkerArgs & playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
 export { AdminPageObjects, BUNDLED_RESOURCES, IdProvider, LanguageHelper, RuleType, StorefrontPageObjects, TestDataService, assertScreenshot, baseNamespaces, compareFlowTemplateWithFlow, createRandomImage, encodeImage, extractIdFromUrl, getCountryId, getCurrency, getCurrentContext, getDefaultShippingMethodId, getFlow, getFlowId, getFlowTemplate, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getShippingMethodId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, hideElements, isSaaSInstance, isThemeCompiled, replaceElements, replaceElementsIndividually, setCurrentContext, setOrderStatus, setViewport, test, translate, updateAdminUser };

package/dist/index.d.ts

@@ -763,7 +763,7 @@ declare class TestDataService {
      * @param productId - The uuid of the product.
      * @param manufacturerId - The uuid of the manufacturer.
      */
-    assignProductManufacturer(productId: string, manufacturerId: string): Promise<void>;
+    assignProductManufacturer(productId: string, manufacturerId: string): Promise<any>;
     /**
      * Assigns a country to a currency with default roundings of 2.
      *
@@ -778,14 +778,14 @@ declare class TestDataService {
      * @param productId - The uuid of the product.
      * @param categoryId - The uuid of the category.
      */
-    assignProductCategory(productId: string, categoryId: string): Promise<playwright_core.APIResponse>;
+    assignProductCategory(productId: string, categoryId: string): Promise<any>;
     /**
      * Assigns a tag to a product.
      *
      * @param productId - The uuid of the product.
      * @param tagId - The uuid of the tag.
      */
-    assignProductTag(productId: string, tagId: string): Promise<playwright_core.APIResponse>;
+    assignProductTag(productId: string, tagId: string): Promise<any>;
     /**
      * Assigns a media resource to a manufacturer as a logo.
      *
@@ -1011,6 +1011,14 @@ declare class TestDataService {
      * @param array
      */
     combineAll: (array: Record<string, string>[][]) => Record<string, string>[][];
+    /**
+     * Generates a random alphanumeric string of a specified length.
+     * Ensures at least one numeric character is included.
+     *
+     * @param length - The desired length of the random string (default: 3)
+     * @returns A random alphanumeric string containing at least one digit
+     */
+    generateRandomId(length?: number): string;
     /**
      * @deprecated Use `getCountry` instead.
      * Retrieves a country Id based on its iso2 code.
@@ -5082,6 +5090,17 @@ declare class ListingPageLayoutDetail implements PageObject {
     url(layoutId: string): string;
 }
 
+declare class SalesChannelDetail implements PageObject {
+    readonly page: Page$1;
+    readonly generalTabLink: Locator$1;
+    readonly productsTabLink: Locator$1;
+    readonly themeTabLink: Locator$1;
+    readonly analyticsTabLink: Locator$1;
+    readonly addDomainButton: Locator$1;
+    constructor(page: Page$1);
+    url(salesChannelId: string): string;
+}
+
 interface AdministrationPageTypes {
     AdminProductDetail: ProductDetail$1;
     AdminOrderDetail: OrderDetail;
@@ -5122,6 +5141,7 @@ interface AdministrationPageTypes {
     AdminPromotionsListing: PromotionsListing;
     AdminPromotionCreate: PromotionCreate;
     AdminPromotionDetail: PromotionDetail;
+    AdminSalesChannelDetail: SalesChannelDetail;
     AdminShopwareServices: ShopwareServices;
     AdminMedia: Media;
     AdminYourProfile: YourProfile;
@@ -5169,6 +5189,7 @@ declare const AdminPageObjects: {
     SettingsListing: typeof SettingsListing;
     DocumentListing: typeof DocumentListing;
     DocumentDetail: typeof DocumentDetail;
+    SalesChannelDetail: typeof SalesChannelDetail;
     ShopwareServices: typeof ShopwareServices;
     PromotionsListing: typeof PromotionsListing;
     PromotionCreate: typeof PromotionCreate;
@@ -5438,7 +5459,7 @@ declare class CheckoutFinish implements PageObject {
     constructor(page: Page);
     url(): string;
     getOrderNumber(): Promise<string | null>;
-    getOrderId(): string | null;
+    getOrderId(): string;
 }
 
 declare class CheckoutRegister implements PageObject {
@@ -5900,6 +5921,8 @@ declare const test: playwright_test.TestType<playwright_test.PlaywrightTestArgs
     AddProductToWishlist: Task;
 } & {
     SelectProductFilterOption: Task;
+} & {
+    CheckVisibilityInHome: Task;
 }, playwright_test.PlaywrightWorkerArgs & playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
 export { AdminPageObjects, BUNDLED_RESOURCES, IdProvider, LanguageHelper, RuleType, StorefrontPageObjects, TestDataService, assertScreenshot, baseNamespaces, compareFlowTemplateWithFlow, createRandomImage, encodeImage, extractIdFromUrl, getCountryId, getCurrency, getCurrentContext, getDefaultShippingMethodId, getFlow, getFlowId, getFlowTemplate, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getShippingMethodId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, hideElements, isSaaSInstance, isThemeCompiled, replaceElements, replaceElementsIndividually, setCurrentContext, setOrderStatus, setViewport, test, translate, updateAdminUser };

package/dist/index.mjs

@@ -217,6 +217,7 @@ class AdminApiContext {
       }
     });
     const authData = await authResponse.json();
+    expect(authResponse.ok(), "Should authenticate with client credentials").toBeTruthy();
     if (!authData["access_token"]) {
       throw new Error(`Failed to authenticate with client_id: ${options.client_id}`);
     }
@@ -233,6 +234,7 @@ class AdminApiContext {
       }
     });
     const authData = await authResponse.json();
+    expect(authResponse.ok(), "Should authenticate with user credentials").toBeTruthy();
     if (!authData["access_token"]) {
       throw new Error(`Failed to authenticate with user: ${options.admin_username}`);
     }
@@ -4294,11 +4296,14 @@ class TestDataService {
    * @param manufacturerId - The uuid of the manufacturer.
    */
   async assignProductManufacturer(productId, manufacturerId) {
-    await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
+    const assignProductManufacturerResponse = await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
       data: {
         manufacturerId
       }
     });
+    expect(assignProductManufacturerResponse.ok()).toBeTruthy();
+    const { data: productManufacturer } = await assignProductManufacturerResponse.json();
+    return productManufacturer;
   }
   /**
    * Assigns a country to a currency with default roundings of 2.
@@ -4344,7 +4349,7 @@ class TestDataService {
    * @param categoryId - The uuid of the category.
    */
   async assignProductCategory(productId, categoryId) {
-    return await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
+    const assignProductCategoryResponse = await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
       data: {
         categories: [
           {
@@ -4353,6 +4358,9 @@ class TestDataService {
         ]
       }
     });
+    expect(assignProductCategoryResponse.ok()).toBeTruthy();
+    const { data: productCategory } = await assignProductCategoryResponse.json();
+    return productCategory;
   }
   /**
    * Assigns a tag to a product.
@@ -4361,7 +4369,7 @@ class TestDataService {
    * @param tagId - The uuid of the tag.
    */
   async assignProductTag(productId, tagId) {
-    return await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
+    const assignProductTagResponse = await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
       data: {
         tags: [
           {
@@ -4370,6 +4378,9 @@ class TestDataService {
         ]
       }
     });
+    expect(assignProductTagResponse.ok()).toBeTruthy();
+    const { data: productTag } = await assignProductTagResponse.json();
+    return productTag;
   }
   /**
    * Assigns a media resource to a manufacturer as a logo.
@@ -5052,6 +5063,27 @@ class TestDataService {
     helper([], 0);
     return result;
   };
+  /**
+   * Generates a random alphanumeric string of a specified length.
+   * Ensures at least one numeric character is included.
+   *
+   * @param length - The desired length of the random string (default: 3)
+   * @returns A random alphanumeric string containing at least one digit
+   */
+  generateRandomId(length = 3) {
+    const LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    const DIGITS = "0123456789";
+    const ALL_CHARS = LETTERS + DIGITS;
+    const chars = Array.from(
+      { length },
+      () => ALL_CHARS.charAt(Math.floor(Math.random() * ALL_CHARS.length))
+    );
+    if (!chars.some((char) => DIGITS.includes(char))) {
+      const randomIndex = Math.floor(Math.random() * length);
+      chars[randomIndex] = DIGITS.charAt(Math.floor(Math.random() * DIGITS.length));
+    }
+    return chars.join("");
+  }
   /**
    * @deprecated Use `getCountry` instead.
    * Retrieves a country Id based on its iso2 code.
@@ -5087,8 +5119,8 @@ class TestDataService {
     const basicCountry = {
       id: countryUuid,
       name: "Country-" + countryId,
-      iso: "" + countryId.substring(0, 2),
-      iso3: "" + countryId.substring(0, 3),
+      iso: this.generateRandomId(2),
+      iso3: this.generateRandomId(3),
       active: true,
       shippingAvailable: true
     };
@@ -5100,7 +5132,7 @@ class TestDataService {
       id: currencyUuid,
       name: "Currency-" + currencyId,
       shortName: "CUR" + currencyId,
-      isoCode: "" + currencyId.substring(0, 3),
+      isoCode: this.generateRandomId(3),
       symbol: "C$",
       factor: 2.4,
       itemRounding: {
@@ -6525,7 +6557,7 @@ class CheckoutFinish {
     const url = this.page.url();
     const [, searchString] = url.split("?");
     const params = new URLSearchParams(searchString);
-    return params.get("orderId");
+    return params.get("orderId") ?? "";
   }
 }
 
@@ -9646,6 +9678,25 @@ class ListingPageLayoutDetail {
   }
 }
 
+class SalesChannelDetail {
+  constructor(page) {
+    this.page = page;
+    this.generalTabLink = page.getByRole("tab", { name: "General" });
+    this.productsTabLink = page.getByRole("tab", { name: "Products" });
+    this.themeTabLink = page.getByRole("tab", { name: "Theme" });
+    this.analyticsTabLink = page.getByRole("tab", { name: "Analytics" });
+    this.addDomainButton = page.getByRole("button", { name: "Add domain" });
+  }
+  generalTabLink;
+  productsTabLink;
+  themeTabLink;
+  analyticsTabLink;
+  addDomainButton;
+  url(salesChannelId) {
+    return `#/sw/sales/channel/detail/${salesChannelId}`;
+  }
+}
+
 const AdminPageObjects = {
   ProductDetail,
   OrderDetail,
@@ -9683,6 +9734,7 @@ const AdminPageObjects = {
   SettingsListing,
   DocumentListing,
   DocumentDetail,
+  SalesChannelDetail,
   ShopwareServices,
   PromotionsListing,
   PromotionCreate,
@@ -9840,6 +9892,9 @@ const test$6 = test$e.extend({
   },
   AdminLayoutCreate: async ({ AdminPage }, use) => {
     await use(new LayoutCreate(AdminPage));
+  },
+  AdminSalesChannelDetail: async ({ AdminPage }, use) => {
+    await use(new SalesChannelDetail(AdminPage));
   }
 });
 
@@ -11278,6 +11333,25 @@ const SelectProductFilterOption = test$e.extend({
   }
 });
 
+const CheckVisibilityInHome = test$e.extend({
+  CheckVisibilityInHome: async ({ ShopCustomer, StorefrontHome, TestDataService }, use) => {
+    const task = (productName) => {
+      return async function CheckVisibilityInHome2() {
+        await TestDataService.clearCaches();
+        const productLocators = await StorefrontHome.getListingItemByProductName(productName);
+        await ShopCustomer.expects(async () => {
+          await ShopCustomer.goesTo(`${StorefrontHome.url()}?a=${Date.now()}`);
+          await ShopCustomer.expects(productLocators.productName).toBeVisible();
+        }).toPass({
+          intervals: [1e3, 2500]
+          // retry after 1 seconds, then every 2.5 seconds
+        });
+      };
+    };
+    await use(task);
+  }
+});
+
 const test$3 = mergeTests(
   Login,
   Logout,
@@ -11303,7 +11377,8 @@ const test$3 = mergeTests(
   RemoveProductFromWishlist,
   AddProductToCartFromWishlist,
   AddProductToWishlist,
-  SelectProductFilterOption
+  SelectProductFilterOption,
+  CheckVisibilityInHome
 );
 
 class FeatureService {

package/package.json

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