@shopware-ag/acceptance-test-suite 3.8.1 → 3.8.2

package/dist/index.d.mts

@@ -549,7 +549,7 @@ declare class TestDataService {
      * @param manufacturerId - The uuid of the manufacturer.
      * @param productId - The uuid of the product.
      */
-    assignManufacturerProduct(manufacturerId: string, productId: string): Promise<playwright_core.APIResponse>;
+    assignManufacturerProduct(manufacturerId: string, productId: string): Promise<void>;
     /**
      * Assigns a product to a category.
      *
@@ -779,6 +779,10 @@ interface TestDataFixtureTypes {
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
     SaaSInstanceSetup: () => Promise<void>;
+    InstanceMeta: {
+        version: string;
+        isSaaS: boolean;
+    };
 }
 
 interface StoreBaseConfig {

package/dist/index.d.ts

@@ -549,7 +549,7 @@ declare class TestDataService {
      * @param manufacturerId - The uuid of the manufacturer.
      * @param productId - The uuid of the product.
      */
-    assignManufacturerProduct(manufacturerId: string, productId: string): Promise<playwright_core.APIResponse>;
+    assignManufacturerProduct(manufacturerId: string, productId: string): Promise<void>;
     /**
      * Assigns a product to a category.
      *
@@ -779,6 +779,10 @@ interface TestDataFixtureTypes {
 interface HelperFixtureTypes {
     IdProvider: IdProvider;
     SaaSInstanceSetup: () => Promise<void>;
+    InstanceMeta: {
+        version: string;
+        isSaaS: boolean;
+    };
 }
 
 interface StoreBaseConfig {

package/dist/index.mjs

@@ -269,6 +269,21 @@ const test$c = test$e.extend({
       const { uuid: customerUuid } = IdProvider.getWorkerDerivedStableId("customer");
       const baseUrl = `${SalesChannelBaseConfig.appUrl}test-${uuid}/`;
       await AdminApiContext.delete(`./customer/${customerUuid}`);
+      const wantedLanguages = /* @__PURE__ */ new Set([SalesChannelBaseConfig.enGBLanguageId, SalesChannelBaseConfig.defaultLanguageId]);
+      const languages = [];
+      const result = await AdminApiContext.get(`./sales-channel/${uuid}/languages`);
+      if (result.ok()) {
+        const salesChannelLanguages = await result.json();
+        wantedLanguages.forEach((l) => {
+          if (!salesChannelLanguages.data.find((i) => i.id === l)) {
+            languages.push({ id: l });
+          }
+        });
+      } else {
+        wantedLanguages.forEach((l) => {
+          languages.push({ id: l });
+        });
+      }
       const syncResp = await AdminApiContext.post("./_action/sync", {
         data: {
           "write-sales-channel": {
@@ -304,7 +319,7 @@ const test$c = test$e.extend({
                   id: customerGroupUuid,
                   name: `${id} Acceptance test`
                 },
-                languages: [{ id: SalesChannelBaseConfig.enGBLanguageId }, { id: SalesChannelBaseConfig.defaultLanguageId }],
+                languages,
                 countries: [{ id: SalesChannelBaseConfig.deCountryId }],
                 shippingMethods: [{ id: SalesChannelBaseConfig.defaultShippingMethod }],
                 paymentMethods: [{ id: SalesChannelBaseConfig.invoicePaymentMethodId }],
@@ -999,6 +1014,7 @@ class TestDataService {
     const productResponse = await this.AdminApiClient.post("./product?_response=detail", {
       data: basicProduct
     });
+    expect(productResponse.ok()).toBeTruthy();
     const { data: product } = await productResponse.json();
     this.addCreatedRecord("product", product.id);
     return product;
@@ -1059,6 +1075,7 @@ class TestDataService {
     const manufacturerResponse = await this.AdminApiClient.post("./product-manufacturer?_response=detail", {
       data: basicManufacturer
     });
+    expect(manufacturerResponse.ok()).toBeTruthy();
     const { data: manufacturer } = await manufacturerResponse.json();
     this.addCreatedRecord("product_manufacturer", manufacturer.id);
     return manufacturer;
@@ -1085,6 +1102,7 @@ class TestDataService {
     const response = await this.AdminApiClient.post("category?_response=detail", {
       data: basicCategory
     });
+    expect(response.ok()).toBeTruthy();
     const { data: category } = await response.json();
     this.addCreatedRecord("category", category.id);
     return category;
@@ -1099,10 +1117,11 @@ class TestDataService {
     const image = createRandomImage(width, height);
     const media = await this.createMediaResource();
     const filename = `${this.namePrefix}Media-${media.id}${this.nameSuffix}`;
-    await this.AdminApiClient.post(`_action/media/${media.id}/upload?extension=png&fileName=${filename}`, {
+    const response = await this.AdminApiClient.post(`_action/media/${media.id}/upload?extension=png&fileName=${filename}`, {
       data: Buffer.from(image.toBuffer()),
       headers: { "content-type": "image/png" }
     });
+    expect(response.ok()).toBeTruthy();
     this.addCreatedRecord("media", media.id);
     return media;
   }
@@ -1114,10 +1133,11 @@ class TestDataService {
   async createMediaTXT(content = "Lorem ipsum dolor") {
     const media = await this.createMediaResource();
     const filename = `${this.namePrefix}Media-${media.id}${this.nameSuffix}`;
-    await this.AdminApiClient.post(`_action/media/${media.id}/upload?extension=txt&fileName=${filename}`, {
+    const response = await this.AdminApiClient.post(`_action/media/${media.id}/upload?extension=txt&fileName=${filename}`, {
       data: content,
       headers: { "content-type": "application/octet-stream" }
     });
+    expect(response.ok()).toBeTruthy();
     this.addCreatedRecord("media", media.id);
     return media;
   }
@@ -1134,6 +1154,7 @@ class TestDataService {
         title: `Title-${id}`
       }
     });
+    expect(mediaResponse.ok()).toBeTruthy();
     const { data: media } = await mediaResponse.json();
     return media;
   }
@@ -1163,6 +1184,7 @@ class TestDataService {
     const propertyGroupResponse = await this.AdminApiClient.post("property-group?_response=detail", {
       data: Object.assign({}, colorPropertyGroup, overrides)
     });
+    expect(propertyGroupResponse.ok()).toBeTruthy();
     const { data: propertyGroup } = await propertyGroupResponse.json();
     this.addCreatedRecord("property_group", propertyGroup.id);
     return propertyGroup;
@@ -1190,6 +1212,7 @@ class TestDataService {
     const propertyGroupResponse = await this.AdminApiClient.post("property-group?_response=detail", {
       data: Object.assign({}, textPropertyGroup, overrides)
     });
+    expect(propertyGroupResponse.ok()).toBeTruthy();
     const { data: propertyGroup } = await propertyGroupResponse.json();
     this.addCreatedRecord("property_group", propertyGroup.id);
     return propertyGroup;
@@ -1206,6 +1229,7 @@ class TestDataService {
         name: tagName
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: tag } = await response.json();
     this.addCreatedRecord("tag", tag.id);
     return tag;
@@ -1231,6 +1255,7 @@ class TestDataService {
     const response = await this.AdminApiClient.post("customer?_response=detail", {
       data: basicCustomerStruct
     });
+    expect(response.ok()).toBeTruthy();
     const customerData = await response.json();
     let customer;
     if (typeof basicCustomerStruct.password !== "string") {
@@ -1278,6 +1303,7 @@ class TestDataService {
     const orderResponse = await this.AdminApiClient.post("order?_response=detail", {
       data: basicOrder
     });
+    expect(orderResponse.ok()).toBeTruthy();
     const { data: order } = await orderResponse.json();
     this.addCreatedRecord("order", order.id);
     return order;
@@ -1293,6 +1319,7 @@ class TestDataService {
     const promotionResponse = await this.AdminApiClient.post("promotion?_response=detail", {
       data: basicPromotion
     });
+    expect(promotionResponse.ok()).toBeTruthy();
     const { data: promotion } = await promotionResponse.json();
     const promotionWithDiscount = await getPromotionWithDiscount(promotion.id, this.AdminApiClient);
     this.addCreatedRecord("promotion", promotion.id);
@@ -1308,6 +1335,7 @@ class TestDataService {
     const paymentMethodResponse = await this.AdminApiClient.post("payment-method?_response=detail", {
       data: basicPaymentMethod
     });
+    expect(paymentMethodResponse.ok()).toBeTruthy();
     const { data: paymentMethod } = await paymentMethodResponse.json();
     this.addCreatedRecord("payment_method", paymentMethod.id);
     return paymentMethod;
@@ -1322,6 +1350,7 @@ class TestDataService {
     const ruleResponse = await this.AdminApiClient.post("rule?_response=detail", {
       data: basicRule
     });
+    expect(ruleResponse.ok()).toBeTruthy();
     const { data: rule } = await ruleResponse.json();
     this.addCreatedRecord("rule", rule.id);
     return rule;
@@ -1351,6 +1380,14 @@ class TestDataService {
       const propertyGroupOptionsCollection = [];
       for (const propertyGroupOption of propertyGroupOptions) {
         propertyGroupOptionsCollection.push({ id: propertyGroupOption.id });
+        const productConfiguratorResponse = await this.AdminApiClient.post("product-configurator-setting?_response=detail", {
+          data: {
+            id: this.IdProvider.getIdPair().uuid,
+            productId: parentProduct.id,
+            optionId: propertyGroupOption.id
+          }
+        });
+        expect(productConfiguratorResponse.ok()).toBeTruthy();
       }
       productVariantCandidates.push(propertyGroupOptionsCollection);
     }
@@ -1387,6 +1424,7 @@ class TestDataService {
    */
   async createBasicShippingMethod(overrides = {}) {
     const deliveryTime = await this.getAllDeliveryTimeResources();
+    overrides.availabilityRuleId ?? (overrides.availabilityRuleId = (await this.getRule("Always valid (Default)")).id);
     const basicShippingMethod = this.getBasicShippingMethodStruct(
       deliveryTime[0].id,
       overrides
@@ -1394,6 +1432,7 @@ class TestDataService {
     const shippingMethodResponse = await this.AdminApiClient.post("shipping-method?_response=detail", {
       data: basicShippingMethod
     });
+    expect(shippingMethodResponse.ok()).toBeTruthy();
     const { data: shippingMethod } = await shippingMethodResponse.json();
     this.addCreatedRecord("shipping_method", shippingMethod.id);
     return shippingMethod;
@@ -1410,6 +1449,7 @@ class TestDataService {
         mediaId
       }
     });
+    expect(paymentMethodResponse.ok()).toBeTruthy();
     const { data: paymentMethodMedia } = await paymentMethodResponse.json();
     return paymentMethodMedia;
   }
@@ -1426,6 +1466,7 @@ class TestDataService {
         mediaId
       }
     });
+    expect(downloadResponse.ok()).toBeTruthy();
     const { data: productDownload } = await downloadResponse.json();
     return productDownload;
   }
@@ -1450,6 +1491,7 @@ class TestDataService {
         ]
       }
     });
+    expect(mediaResponse.ok()).toBeTruthy();
     const { data: productMedia } = await mediaResponse.json();
     return productMedia;
   }
@@ -1465,6 +1507,7 @@ class TestDataService {
         mediaId
       }
     });
+    expect(mediaResponse.ok()).toBeTruthy();
     const { data: manufacturerMedia } = await mediaResponse.json();
     return manufacturerMedia;
   }
@@ -1475,7 +1518,7 @@ class TestDataService {
    * @param productId - The uuid of the product.
    */
   async assignManufacturerProduct(manufacturerId, productId) {
-    return await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
+    await this.AdminApiClient.patch(`product/${productId}?_response=basic`, {
       data: {
         manufacturerId
       }
@@ -1527,6 +1570,7 @@ class TestDataService {
         }]
       }
     });
+    expect(currencyResponse.ok()).toBeTruthy();
     const { data: result } = await currencyResponse.json();
     return result[0];
   }
@@ -1546,6 +1590,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result[0];
   }
@@ -1565,6 +1610,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result[0];
   }
@@ -1580,6 +1626,7 @@ class TestDataService {
         mediaId
       }
     });
+    expect(shippingMethodResponse.ok()).toBeTruthy();
     const { data: shippingMethodMedia } = await shippingMethodResponse.json();
     return shippingMethodMedia;
   }
@@ -1588,6 +1635,7 @@ class TestDataService {
    */
   async getAllDeliveryTimeResources() {
     const response = await this.AdminApiClient.get("delivery-time");
+    expect(response.ok()).toBeTruthy();
     const { data: deliveryTimeResources } = await response.json();
     return deliveryTimeResources;
   }
@@ -1607,6 +1655,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result[0];
   }
@@ -1617,6 +1666,7 @@ class TestDataService {
    */
   async getCustomerAddress(addressId) {
     const response = await this.AdminApiClient.get(`customer-address/${addressId}`);
+    expect(response.ok()).toBeTruthy();
     const { data: address } = await response.json();
     return address;
   }
@@ -1636,6 +1686,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result[0];
   }
@@ -1673,6 +1724,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result[0];
   }
@@ -1697,6 +1749,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result[0];
   }
@@ -1716,6 +1769,7 @@ class TestDataService {
         }]
       }
     });
+    expect(response.ok()).toBeTruthy();
     const { data: result } = await response.json();
     return result;
   }
@@ -2374,6 +2428,18 @@ const test$7 = test$e.extend({
       await use(SetupInstance);
     },
     { scope: "worker" }
+  ],
+  InstanceMeta: [
+    async ({ AdminApiContext: context }, use) => {
+      const response = await context.get("./_info/config");
+      expect(response.ok(), "/_info/config request failed").toBeTruthy();
+      const config = await response.json();
+      use({
+        version: config.version,
+        isSaaS: await isSaaSInstance(context)
+      });
+    },
+    { scope: "worker" }
   ]
 });
 
@@ -2454,7 +2520,7 @@ class Category {
     this.noProductsFoundAlert = page.getByText("No products found.");
   }
   url(categoryName) {
-    return `${categoryName}`;
+    return `${categoryName}/`;
   }
 }
 
@@ -2836,7 +2902,7 @@ class AccountAddresses {
     __publicField$d(this, "editShippingAddressButton");
     __publicField$d(this, "useDefaultBillingAddressButton");
     __publicField$d(this, "useDefaultShippingAddressButton");
-    this.addNewAddressButton = page.getByRole("link", { name: "Add new address" });
+    this.addNewAddressButton = page.getByRole("link", { name: /Add (new )?address/ });
     this.editBillingAddressButton = page.getByRole("link", { name: "Edit address" }).first();
     this.editShippingAddressButton = page.getByRole("link", { name: "Edit address" }).nth(1);
     this.useDefaultBillingAddressButton = page.getByRole("button", { name: "Use as default billing address" });

package/package.json

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