@shopware-ag/acceptance-test-suite 12.4.0 → 12.4.2

package/dist/index.d.mts

@@ -459,8 +459,40 @@ declare const setOrderStatus: (orderId: string, orderStatus: OrderStatus, adminA
 declare const getPromotionWithDiscount: (promotionId: string, adminApiContext: AdminApiContext) => Promise<Promotion>;
 declare const updateAdminUser: (adminUserId: string, adminApiContext: AdminApiContext, data: Record<string, string | boolean>) => Promise<void>;
 
+interface RequestOptions<PAYLOAD> {
+    [key: string]: unknown;
+    data?: PAYLOAD;
+}
+interface StoreUser {
+    email: string;
+    password: string;
+}
+interface StoreApiContextOptions {
+    'app_url'?: string;
+    'sw-access-key'?: string;
+    'sw-context-token'?: string;
+    ignoreHTTPSErrors?: boolean;
+}
+declare class StoreApiContext {
+    private context;
+    private readonly options;
+    private static readonly defaultOptions;
+    constructor(context: APIRequestContext, options: StoreApiContextOptions);
+    static create(options?: StoreApiContextOptions): Promise<StoreApiContext>;
+    private static createContext;
+    login(user: StoreUser): Promise<{
+        [key: string]: string;
+    }>;
+    get<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    post<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    patch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    delete<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    fetch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    head<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+}
+
 declare const isSaaSInstance: (adminApiContext: AdminApiContext) => Promise<boolean>;
-declare const isThemeCompiled: (context: AdminApiContext, storefrontUrl: string) => Promise<boolean>;
+declare const isThemeCompiled: (context: StoreApiContext, storefrontUrl: string) => Promise<boolean>;
 
 declare function createRandomImage(width?: number, height?: number): Image;
 declare function encodeImage(image: Image): Buffer<ArrayBuffer>;
@@ -4156,38 +4188,6 @@ declare function setCurrentContext(context: Record<string, unknown> | null): voi
 declare function getCurrentContext(): Record<string, unknown> | null;
 declare function translate(key: TranslationKey, options?: Record<string, unknown>): string;
 
-interface RequestOptions<PAYLOAD> {
-    [key: string]: unknown;
-    data?: PAYLOAD;
-}
-interface StoreUser {
-    email: string;
-    password: string;
-}
-interface StoreApiContextOptions {
-    'app_url'?: string;
-    'sw-access-key'?: string;
-    'sw-context-token'?: string;
-    ignoreHTTPSErrors?: boolean;
-}
-declare class StoreApiContext {
-    private context;
-    private readonly options;
-    private static readonly defaultOptions;
-    constructor(context: APIRequestContext, options: StoreApiContextOptions);
-    static create(options?: StoreApiContextOptions): Promise<StoreApiContext>;
-    private static createContext;
-    login(user: StoreUser): Promise<{
-        [key: string]: string;
-    }>;
-    get<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    post<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    patch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    delete<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    fetch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    head<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-}
-
 interface Email {
     fromName: string;
     fromAddress: string;

package/dist/index.d.ts

@@ -459,8 +459,40 @@ declare const setOrderStatus: (orderId: string, orderStatus: OrderStatus, adminA
 declare const getPromotionWithDiscount: (promotionId: string, adminApiContext: AdminApiContext) => Promise<Promotion>;
 declare const updateAdminUser: (adminUserId: string, adminApiContext: AdminApiContext, data: Record<string, string | boolean>) => Promise<void>;
 
+interface RequestOptions<PAYLOAD> {
+    [key: string]: unknown;
+    data?: PAYLOAD;
+}
+interface StoreUser {
+    email: string;
+    password: string;
+}
+interface StoreApiContextOptions {
+    'app_url'?: string;
+    'sw-access-key'?: string;
+    'sw-context-token'?: string;
+    ignoreHTTPSErrors?: boolean;
+}
+declare class StoreApiContext {
+    private context;
+    private readonly options;
+    private static readonly defaultOptions;
+    constructor(context: APIRequestContext, options: StoreApiContextOptions);
+    static create(options?: StoreApiContextOptions): Promise<StoreApiContext>;
+    private static createContext;
+    login(user: StoreUser): Promise<{
+        [key: string]: string;
+    }>;
+    get<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    post<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    patch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    delete<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    fetch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+    head<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
+}
+
 declare const isSaaSInstance: (adminApiContext: AdminApiContext) => Promise<boolean>;
-declare const isThemeCompiled: (context: AdminApiContext, storefrontUrl: string) => Promise<boolean>;
+declare const isThemeCompiled: (context: StoreApiContext, storefrontUrl: string) => Promise<boolean>;
 
 declare function createRandomImage(width?: number, height?: number): Image;
 declare function encodeImage(image: Image): Buffer<ArrayBuffer>;
@@ -4156,38 +4188,6 @@ declare function setCurrentContext(context: Record<string, unknown> | null): voi
 declare function getCurrentContext(): Record<string, unknown> | null;
 declare function translate(key: TranslationKey, options?: Record<string, unknown>): string;
 
-interface RequestOptions<PAYLOAD> {
-    [key: string]: unknown;
-    data?: PAYLOAD;
-}
-interface StoreUser {
-    email: string;
-    password: string;
-}
-interface StoreApiContextOptions {
-    'app_url'?: string;
-    'sw-access-key'?: string;
-    'sw-context-token'?: string;
-    ignoreHTTPSErrors?: boolean;
-}
-declare class StoreApiContext {
-    private context;
-    private readonly options;
-    private static readonly defaultOptions;
-    constructor(context: APIRequestContext, options: StoreApiContextOptions);
-    static create(options?: StoreApiContextOptions): Promise<StoreApiContext>;
-    private static createContext;
-    login(user: StoreUser): Promise<{
-        [key: string]: string;
-    }>;
-    get<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    post<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    patch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    delete<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    fetch<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-    head<PAYLOAD>(url: string, options?: RequestOptions<PAYLOAD>): Promise<APIResponse>;
-}
-
 interface Email {
     fromName: string;
     fromAddress: string;

package/dist/index.mjs

@@ -3748,7 +3748,7 @@ const test$b = test$e.extend({
     setCurrentContext(null);
     await AdminApiContext.delete(`user/${uuid}`);
   },
-  StorefrontPage: async ({ DefaultSalesChannel, SalesChannelBaseConfig, browser, AdminApiContext, InstanceMeta, CustomTranslationResources }, use) => {
+  StorefrontPage: async ({ DefaultSalesChannel, SalesChannelBaseConfig, browser, AdminApiContext, StoreApiContext, InstanceMeta, CustomTranslationResources }, use) => {
     const { url, salesChannel } = DefaultSalesChannel;
     const locale = getLocale();
     const languageHelper = await LanguageHelper.createInstance(locale, CustomTranslationResources);
@@ -3760,13 +3760,13 @@ const test$b = test$e.extend({
     LanguageHelper.setForContext(context, languageHelper);
     setCurrentContext(context);
     let page;
-    if (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
+    if (!await isThemeCompiled(StoreApiContext, DefaultSalesChannel.url)) {
       test$e.slow();
       await AdminApiContext.post(`./_action/theme/${SalesChannelBaseConfig.defaultThemeId}/assign/${salesChannel.id}`);
       await clearDelayedCache(AdminApiContext);
       page = await context.newPage();
       if (InstanceMeta.isSaaS) {
-        while (!await isThemeCompiled(AdminApiContext, DefaultSalesChannel.url)) {
+        while (!await isThemeCompiled(StoreApiContext, DefaultSalesChannel.url)) {
           await clearDelayedCache(AdminApiContext);
           await page.waitForTimeout(4e3);
         }
@@ -3815,6 +3815,7 @@ class Actor {
   }
   expects = expect;
   async a11y_checks(locator) {
+    await locator.scrollIntoViewIfNeeded();
     await locator.focus();
     await expect(locator).toBeFocused();
     await expect(locator).toHaveVisibleFocus();
@@ -3844,25 +3845,24 @@ class Actor {
     const stepTitle = `${this.name} selects radio button ${inputLabel}`;
     await test$e.step(stepTitle, async () => {
       const desiredOption = radioGroup.getByRole("radio", { name: inputLabel });
-      if (!await desiredOption.isChecked()) {
-        const options = [];
-        for (const labelEl of await radioGroup.locator("label").all()) {
-          const label = await labelEl.innerText();
-          const radioButton = radioGroup.getByRole("radio", { name: label });
-          const isChecked = await radioButton.isChecked();
-          options.push({ label, locator: radioButton, isChecked });
-        }
-        const defaultOptionIndex = options.findIndex((opt) => opt.isChecked);
-        const desiredOptionIndex = options.findIndex((opt) => opt.label === inputLabel);
-        if (defaultOptionIndex === -1) {
-          throw new Error(`No option is selected by default.`);
-        }
-        const step = defaultOptionIndex < desiredOptionIndex ? 1 : -1;
-        const inputKey = step === 1 ? "ArrowDown" : "ArrowUp";
-        for (let i = defaultOptionIndex; i !== desiredOptionIndex; i += step) {
-          await this.presses(options[i].locator, inputKey);
-          await this.page.waitForLoadState("domcontentloaded");
+      if (await desiredOption.isChecked()) {
+        await this.a11y_checks(desiredOption);
+        return;
+      }
+      let checkedRadio = radioGroup.getByRole("radio", { checked: true });
+      if (!await checkedRadio.count()) {
+        throw new Error("No radio button is selected by default.");
+      }
+      const maxIterations = await radioGroup.getByRole("radio").count();
+      let iterations = 0;
+      while (!await desiredOption.isChecked()) {
+        if (iterations >= maxIterations) {
+          throw new Error(`Could not reach radio button "${inputLabel}" via keyboard navigation.`);
         }
+        await this.presses(checkedRadio, "ArrowDown");
+        await this.page.waitForLoadState("domcontentloaded");
+        checkedRadio = radioGroup.getByRole("radio", { checked: true });
+        iterations++;
       }
       await this.a11y_checks(desiredOption);
     });
@@ -11740,7 +11740,6 @@ const ProceedFromProductToCheckout = test$e.extend({
   ProceedFromProductToCheckout: async ({ ShopCustomer, StorefrontProductDetail, StorefrontCheckoutConfirm }, use) => {
     const task = () => {
       return async function ProceedFromProductToCheckout2() {
-        await StorefrontProductDetail.offCanvasCartGoToCheckoutButton.scrollIntoViewIfNeeded();
         await ShopCustomer.presses(StorefrontProductDetail.offCanvasCartGoToCheckoutButton);
         await StorefrontCheckoutConfirm.page.waitForURL("**/checkout/confirm", { waitUntil: "commit" });
         await ShopCustomer.expects(StorefrontCheckoutConfirm.headline).toBeVisible();
@@ -11757,8 +11756,8 @@ const CloseTheOffCanvasCart = test$e.extend({
   }, use) => {
     const task = () => {
       return async function CloseTheOffCanvasCart2() {
-        await StorefrontOffCanvasCart.continueShoppingButton.scrollIntoViewIfNeeded();
         await ShopCustomer.presses(StorefrontOffCanvasCart.continueShoppingButton);
+        await ShopCustomer.expects(StorefrontOffCanvasCart.continueShoppingButton).not.toBeVisible();
       };
     };
     await use(task);

package/package.json

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