@shopware-ag/acceptance-test-suite 12.14.1 → 12.15.1

package/dist/index.mjs

@@ -3893,11 +3893,28 @@ async function createNewAdminPageContext(browser, SalesChannelBaseConfig) {
     baseURL: SalesChannelBaseConfig.adminUrl,
     serviceWorkers: "block"
   });
+  await mockApiCalls(context);
   const adminPage = await context.newPage();
   await adminPage.goto("#/login");
-  await mockApiCalls(adminPage);
   return adminPage;
 }
+function hideSymfonyToolbarOnReload(page) {
+  const originalReload = page.reload.bind(page);
+  page.reload = async () => {
+    const res = await originalReload();
+    await page.addStyleTag({
+      content: `
+                .sf-toolbar {
+                    width: 0 !important;
+                    height: 0 !important;
+                    display: none !important;
+                    pointer-events: none !important;
+                }
+                `.trim()
+    });
+    return res;
+  };
+}
 async function loginToAdministration(adminLoginPage, merchant, AdminApiContext) {
   const usernamePattern = new RegExp(`${translate("administration:login:username")}|${translate("administration:login:emailAddress")}`);
   const passwordLabel = translate("administration:login:password");
@@ -3914,21 +3931,7 @@ async function loginToAdministration(adminLoginPage, merchant, AdminApiContext)
   const loginButtonLabel = translate("administration:login:loginButton");
   await adminLoginPage.getByRole("button", { name: loginButtonLabel, exact: true }).click();
   await Promise.all(jsLoadingPromises);
-  const originalReload = adminLoginPage.reload.bind(adminLoginPage);
-  adminLoginPage.reload = async () => {
-    const res = await originalReload();
-    await adminLoginPage.addStyleTag({
-      content: `
-                .sf-toolbar {
-                    width: 0 !important;
-                    height: 0 !important;
-                    display: none !important;
-                    pointer-events: none !important;
-                }
-                `.trim()
-    });
-    return res;
-  };
+  hideSymfonyToolbarOnReload(adminLoginPage);
   await clearDelayedCache(AdminApiContext);
   await expect(adminLoginPage.locator(".sw-skeleton")).toHaveCount(0);
   await adminLoginPage.waitForURL((url) => {
@@ -3939,32 +3942,47 @@ async function loginToAdministration(adminLoginPage, merchant, AdminApiContext)
 }
 
 const test$b = test$e.extend({
-  AdminPage: async ({ IdProvider, AdminApiContext, SalesChannelBaseConfig, browser, CustomTranslationResources }, use) => {
+  AdminSession: [
+    async ({ IdProvider, AdminApiContext, SalesChannelBaseConfig, browser }, use) => {
+      const { id, uuid } = IdProvider.getIdPair();
+      const adminUser = {
+        id: uuid,
+        username: `admin_${id}`,
+        firstName: `${id} admin`,
+        lastName: `${id} admin`,
+        localeId: SalesChannelBaseConfig.currentLocaleId,
+        email: `admin_${id}@example.com`,
+        timeZone: "Europe/Berlin",
+        password: "shopware",
+        admin: true
+      };
+      const response = await AdminApiContext.post("user", {
+        data: adminUser
+      });
+      expect(response.ok()).toBeTruthy();
+      const loginPage = await loginToAdministration(await createNewAdminPageContext(browser, SalesChannelBaseConfig), adminUser, AdminApiContext);
+      const context = loginPage.context();
+      await loginPage.close();
+      await use({ context, user: adminUser });
+      await context.close();
+      await AdminApiContext.delete(`user/${uuid}`);
+    },
+    { scope: "worker" }
+  ],
+  AdminPage: async ({ AdminSession, CustomTranslationResources }, use) => {
     const locale = getLocale();
     const languageHelper = await LanguageHelper.createInstance(locale, CustomTranslationResources);
-    const { id, uuid } = IdProvider.getIdPair();
-    const adminUser = {
-      id: uuid,
-      username: `admin_${id}`,
-      firstName: `${id} admin`,
-      lastName: `${id} admin`,
-      localeId: SalesChannelBaseConfig.currentLocaleId,
-      email: `admin_${id}@example.com`,
-      timezone: "Europe/Berlin",
-      password: "shopware",
-      admin: true
-    };
-    const response = await AdminApiContext.post("user", {
-      data: adminUser
-    });
-    expect(response.ok()).toBeTruthy();
-    const page = await loginToAdministration(await createNewAdminPageContext(browser, SalesChannelBaseConfig), adminUser, AdminApiContext);
+    const page = await AdminSession.context.newPage();
+    hideSymfonyToolbarOnReload(page);
+    await page.goto("./");
+    await page.waitForURL((url) => url.hash.startsWith("#/") && !url.hash.startsWith("#/login"));
+    await expect(page.getByText(AdminSession.user.firstName + " " + AdminSession.user.lastName).first()).toBeVisible({ timeout: 6e4 });
+    await expect(page.locator(".sw-skeleton")).toHaveCount(0);
     LanguageHelper.setForContext(page.context(), languageHelper);
     setCurrentContext(page.context());
     await use(page);
     await page.close();
     setCurrentContext(null);
-    await AdminApiContext.delete(`user/${uuid}`);
   },
   StorefrontPage: async ({ DefaultSalesChannel, SalesChannelBaseConfig, browser, AdminApiContext, StoreApiContext, InstanceMeta, CustomTranslationResources }, use) => {
     const { url, salesChannel } = DefaultSalesChannel;
@@ -4306,7 +4324,7 @@ class TestDataService {
     const product = await this.createBasicProduct({ type: "digital", maxPurchase: 1, ...overrides }, taxId, currencyId);
     const media = await this.createMediaTXT(content);
     await this.assignProductDownload(product.id, media.id);
-    return product;
+    return { ...product, states: [...product.states ?? [], "is-download"] };
   }
   /**
    * Creates a basic product with a price range matrix.
@@ -6687,7 +6705,10 @@ class IdProvider {
     bytes[6] = 1 << 5;
     bytes[8] = 128;
     return {
-      id: `${this.workerIndex}`,
+      // Derived from the hash like the uuid, so ids (and names/emails built from
+      // them, e.g. the worker customer email) stay distinct between runs with
+      // different seeds. A plain worker index collides across concurrent suites.
+      id: `${buffer.readUIntBE(16, 6)}`,
       uuid: stringify(bytes).replaceAll("-", "")
     };
   }
@@ -6696,7 +6717,8 @@ class IdProvider {
 const test$8 = test$e.extend({
   IdProvider: [
     async ({}, use, workerInfo) => {
-      const seed = process.env.SHOPWARE_ACCESS_KEY_ID || process.env.SHOPWARE_ADMIN_PASSWORD || "test-suite";
+      const baseSeed = process.env.SHOPWARE_ACCESS_KEY_ID || process.env.SHOPWARE_ADMIN_PASSWORD || "test-suite";
+      const seed = process.env.ATS_ID_SEED ? `${process.env.ATS_ID_SEED}:${baseSeed}` : baseSeed;
       const idProvider = new IdProvider(workerInfo.parallelIndex, seed);
       await use(idProvider);
     },
@@ -10828,7 +10850,7 @@ class ListingPageLayoutDetail {
   navigatorButton;
   layoutAssignmentButton;
   page;
-  constructor(page) {
+  constructor(page, instanceMeta) {
     this.page = page;
     this.addSectionButton = page.locator(".sw-cms-stage-add-section__button");
     this.sectionSelectionField = page.locator(".sw-cms-stage-section-selection");
@@ -10840,10 +10862,19 @@ class ListingPageLayoutDetail {
     this.loaderButton = page.locator(".mt-button__loader");
     this.productListingBlock = page.locator(".sw-cms-block-product-listing");
     this.sidebarTitle = page.locator(".sw-sidebar-item__title");
-    this.settingsButton = page.locator(`button[title="${translate("administration:layout:detail.settings")}"]`);
-    this.blocksButton = page.locator(`button[title="${translate("administration:layout:detail.blocks")}"]`);
-    this.navigatorButton = page.locator(`button[title="${translate("administration:layout:detail.navigator")}"]`);
-    this.layoutAssignmentButton = page.locator(`button[title="${translate("administration:layout:detail.layoutAssignment")}"]`);
+    if (satisfies(instanceMeta.version, "<6.7.13.0")) {
+      this.settingsButton = page.locator(`button[title="${translate("administration:layout:detail.settings")}"]`);
+      this.blocksButton = page.locator(`button[title="${translate("administration:layout:detail.blocks")}"]`);
+      this.navigatorButton = page.locator(`button[title="${translate("administration:layout:detail.navigator")}"]`);
+      this.layoutAssignmentButton = page.locator(`button[title="${translate("administration:layout:detail.layoutAssignment")}"]`);
+    } else {
+      this.settingsButton = page.getByLabel(translate("administration:layout:detail.settings"), { exact: true });
+      this.blocksButton = page.getByLabel(translate("administration:layout:detail.blocks"), { exact: true });
+      this.navigatorButton = page.getByLabel(translate("administration:layout:detail.navigator"), { exact: true });
+      this.layoutAssignmentButton = page.getByLabel(translate("administration:layout:detail.layoutAssignment"), {
+        exact: true
+      });
+    }
   }
   url(layoutId) {
     return `#/sw/cms/detail/${layoutId}`;
@@ -11185,8 +11216,8 @@ const test$6 = test$e.extend({
   AdminLayoutListing: async ({ AdminPage }, use) => {
     await use(new LayoutListing(AdminPage));
   },
-  AdminListingPageLayoutDetail: async ({ AdminPage }, use) => {
-    await use(new ListingPageLayoutDetail(AdminPage));
+  AdminListingPageLayoutDetail: async ({ AdminPage, InstanceMeta }, use) => {
+    await use(new ListingPageLayoutDetail(AdminPage, InstanceMeta));
   },
   AdminLayoutCreate: async ({ AdminPage }, use) => {
     await use(new LayoutCreate(AdminPage));
@@ -12652,12 +12683,12 @@ const AddProductToCartFromWishlist = test$e.extend({
     const task = (ProductData) => {
       return async function AddProductToCartFromWishlist2() {
         const listedItem = await StorefrontWishlist.getListingItemByProductName(ProductData.name);
+        const expectedPrice = await listedItem.productPrice.innerText();
         await ShopCustomer.presses(listedItem.productAddToShoppingCart);
         await StorefrontWishlist.page.waitForResponse((response) => response.url().includes(`checkout/offcanvas`) && response.ok());
         await ShopCustomer.expects(StorefrontOffCanvasCart.itemCount).toBeVisible();
         const offcanvasItem = await StorefrontOffCanvasCart.getLineItemByProductNumber(ProductData.productNumber);
         const itemsPrice = await offcanvasItem.productTotalPriceValue.innerText();
-        const expectedPrice = await listedItem.productPrice.innerText();
         ShopCustomer.expects(itemsPrice).toBe(expectedPrice);
       };
     };
@@ -13215,4 +13246,4 @@ const test = mergeTests(
   test$3
 );
 
-export { Actor, AdminPageObjects, BUNDLED_RESOURCES, COUNTRY_ADDRESS_DATA, FeatureService, IdProvider, LanguageHelper, RuleType, StorefrontPageObjects, TestDataService, assertScreenshot, baseNamespaces, clearDelayedCache, compareFlowTemplateWithFlow, createNewAdminPageContext, createRandomImage, createSolidColorImage, encodeImage, extractIdFromUrl, formatPrice, getCountryAddressData, getCountryCodeFromLocale, getCountryId, getCurrency, getCurrencyCodeFromLocale, getCurrencySymbolFromLocale, getCurrentContext, getDefaultShippingMethodId, getFlow, getFlowId, getFlowTemplate, getLanguageCode, getLanguageData, getLocale, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getShippingMethodId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, hideElements, isPaaSInstance, isSaaSInstance, isThemeCompiled, loginToAdministration, mockApiCalls, replaceElements, replaceElementsIndividually, setCurrentContext, setOrderStatus, setViewport, test, translate, updateAdminUser, uploadRandomPngMedia };
+export { Actor, AdminPageObjects, BUNDLED_RESOURCES, COUNTRY_ADDRESS_DATA, FeatureService, IdProvider, LanguageHelper, RuleType, StorefrontPageObjects, TestDataService, assertScreenshot, baseNamespaces, clearDelayedCache, compareFlowTemplateWithFlow, createNewAdminPageContext, createRandomImage, createSolidColorImage, encodeImage, extractIdFromUrl, formatPrice, getCountryAddressData, getCountryCodeFromLocale, getCountryId, getCurrency, getCurrencyCodeFromLocale, getCurrencySymbolFromLocale, getCurrentContext, getDefaultShippingMethodId, getFlow, getFlowId, getFlowTemplate, getLanguageCode, getLanguageData, getLocale, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getShippingMethodId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, hideElements, hideSymfonyToolbarOnReload, isPaaSInstance, isSaaSInstance, isThemeCompiled, loginToAdministration, mockApiCalls, replaceElements, replaceElementsIndividually, setCurrentContext, setOrderStatus, setViewport, test, translate, updateAdminUser, uploadRandomPngMedia };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@shopware-ag/acceptance-test-suite",
-    "version": "12.14.1",
+    "version": "12.15.1",
     "description": "Shopware Acceptance Test Suite",
     "keywords": [
         "fixtures",
@@ -35,7 +35,7 @@
         "format": "oxfmt --write .",
         "typecheck": "tsgo --noEmit",
         "build": "unbuild",
-        "prepare": "lefthook install",
+        "prepare": "(lefthook install || true) && npm run build",
         "prepublishOnly": "npm run build"
     },
     "dependencies": {