Merge pull request #33963 from Progi1984/test5211

Functional Tests : BO - Catalog - Products : Pack Tab

tests/UI/campaigns/productV2/functional/04_CRUDPackOfProducts.ts

@@ -401,7 +401,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       it(`should check the product '${test.args.product.name}' in the pack`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkProductInPack${index}`, baseContext);
 
-        const result = await foProductPage.getProductInPackList(page, index + 2);
+        const result = await foProductPage.getProductInPackList(page, index + 1);
         await Promise.all([
           await expect(result.image).to.contains(test.args.product.coverImage),
           await expect(result.name).to.equal(test.args.product.name),
@@ -470,7 +470,7 @@ describe('BO - Catalog - Products : CRUD pack of products', async () => {
       it(`should check the product '${test.args.product.name}' in the pack`, async function () {
         await testContext.addContextItem(this, 'testIdentifier', `checkEditProductInPack${index}`, baseContext);
 
-        const result = await foProductPage.getProductInPackList(page, index + 2);
+        const result = await foProductPage.getProductInPackList(page, index + 1);
         await Promise.all([
           await expect(result.image).to.contains(test.args.product.coverImage),
           await expect(result.name).to.equal(test.args.product.name),

tests/UI/data/demo/products.ts

@@ -99,19 +99,20 @@ export default {
     quantity: 1200,
     status: true,
   }),
-  demo_12: new ProductData({
-    id: 7,
-    name: 'Mug The adventure begins',
-    thumbImage: 'mug-the-adventure-begins.jpg',
-    coverImage: 'mug-the-adventure-begins.jpg',
-    reference: 'demo_12',
-    category: 'Home Accessories',
-    summary: 'White Ceramic Mug. 325ml',
-    priceTaxExcluded: 11.9,
-    price: 14.28,
-    tax: 20,
-    quantity: 300,
+  demo_9: new ProductData({
+    id: 17,
+    name: 'Brown bear notebook',
+    reference: 'demo_9',
+    category: 'Stationery',
+    price: 15.48,
+    quantity: 1200,
     status: true,
+    attributes: [
+      {
+        name: 'Paper Type',
+        values: ['Ruled', 'Plain', 'Squarred', 'Doted'],
+      },
+    ],
   }),
   demo_11: new ProductData({
     id: 6,
@@ -127,6 +128,20 @@ export default {
     quantity: 300,
     status: true,
   }),
+  demo_12: new ProductData({
+    id: 7,
+    name: 'Mug The adventure begins',
+    thumbImage: 'mug-the-adventure-begins.jpg',
+    coverImage: 'mug-the-adventure-begins.jpg',
+    reference: 'demo_12',
+    category: 'Home Accessories',
+    summary: 'White Ceramic Mug. 325ml',
+    priceTaxExcluded: 11.9,
+    price: 14.28,
+    tax: 20,
+    quantity: 300,
+    status: true,
+  }),
   demo_13: new ProductData({
     id: 8,
     name: 'Mug Today is a good day',

tests/UI/pages/BO/catalog/productsV2/add/index.ts

@@ -211,7 +211,9 @@ class CreateProduct extends BOBasePage {
       priceTaxExc: await this.getTextContent(page, this.productHeaderTaxExcluded),
       priceTaxIncl: await this.getTextContent(page, this.productHeaderTaxIncluded),
       quantity: await this.getTextContent(page, this.productHeaderQuantity, false),
-      reference: await this.getTextContent(page, this.productHeaderReference('reference'), false),
+      reference: (await page.locator(this.productHeaderReference('reference')).count())
+        ? await this.getTextContent(page, this.productHeaderReference('reference'), false)
+        : '',
       mpn: (await page.locator(this.productHeaderReference('mpn')).count())
         ? await this.getTextContent(page, this.productHeaderReference('mpn'), false)
         : '',

tests/UI/pages/BO/catalog/productsV2/add/packTab.ts

@@ -44,6 +44,8 @@ class PackTab extends BOBasePage {
 
   private readonly alertDangerProductInPack: (productInList: number) => string;
 
+  private readonly editQuantityBase: string;
+
   private readonly editQuantityInput: string;
 
   private readonly minimalQuantityInput: string;
@@ -108,6 +110,7 @@ class PackTab extends BOBasePage {
       + 'delta_quantity + span';
 
     // Edit quantity selectors
+    this.editQuantityBase = 'input#product_stock_quantities_delta_quantity_quantity';
     this.editQuantityInput = '#product_stock_quantities_delta_quantity_delta';
     this.minimalQuantityInput = '#product_stock_quantities_minimal_quantity';
     this.packStockTypeRadioButton = (buttonRow: number) => `#product_stock_pack_stock_type_${buttonRow} +i`;
@@ -245,7 +248,7 @@ class PackTab extends BOBasePage {
   async getStockMovement(page: Page, movementRow: number): Promise<ProductStockMovement> {
     return {
       dateTime: await this.getTextContent(page, this.dateTimeRowInTable(movementRow - 1)),
-      employee: await this.getTextContent(page, this.employeeRowInTable(movementRow - 1)),
+      employee: await this.getTextContent(page, this.employeeRowInTable(movementRow - 1), false),
       quantity: await this.getNumberFromText(page, this.quantityRowInTable(movementRow - 1)),
     };
   }
@@ -301,10 +304,27 @@ class PackTab extends BOBasePage {
    * @param packData {ProductPackOptions} Data to edit pack of products
    */
   async editPackOfProducts(page: Page, packData: ProductPackOptions): Promise<void> {
-    await this.setValue(page, this.editQuantityInput, packData.quantity);
+    await this.editQuantity(page, packData.quantity);
     await this.setValue(page, this.minimalQuantityInput, packData.minimalQuantity);
+    await this.editPackStockType(page, packData.packQuantitiesOption);
+  }
+
+  /**
+   * Edit quantity
+   * @param page {Page} Browser tab
+   * @param quantity {number} Quantity
+   */
+  async editQuantity(page: Page, quantity: number): Promise<void> {
+    await this.setValue(page, this.editQuantityInput, quantity);
+  }
 
-    switch (packData.packQuantitiesOption) {
+  /**
+   * Edit quantity
+   * @param page {Page} Browser tab
+   * @param packStockType {string} Quantity
+   */
+  async editPackStockType(page: Page, packStockType: string): Promise<void> {
+    switch (packStockType) {
       case 'Decrement pack only':
         await page.click(this.packStockTypeRadioButton(0));
         break;
@@ -322,9 +342,18 @@ class PackTab extends BOBasePage {
         break;
 
       default:
-        throw new Error(`Radio button for ${packData.packQuantitiesOption} was not found`);
+        throw new Error(`Radio button for ${packStockType} was not found`);
     }
   }
+
+  /**
+   * Get the value of the stock
+   * @param page {Page} Browser tab
+   * @return <Promise<number>>
+   */
+  async getStockValue(page: Page): Promise<number> {
+    return parseInt(await page.locator(this.editQuantityBase).getAttribute('value') ?? '', 10);
+  }
 }
 
 export default new PackTab();

tests/UI/pages/FO/product/index.ts

@@ -77,6 +77,8 @@ class Product extends FOBasePage {
 
   private readonly regularPrice: string;
 
+  private readonly packProductsPrice: string;
+
   private readonly productPrice: string;
 
   private readonly taxShippingDeliveryBlock: string;
@@ -181,6 +183,7 @@ class Product extends FOBasePage {
     this.discountAmountSpan = `${this.productPricesBlock} .discount.discount-amount`;
     this.discountPercentageSpan = `${this.productPricesBlock} .discount.discount-percentage`;
     this.regularPrice = `${this.productPricesBlock} .regular-price`;
+    this.packProductsPrice = `${this.productPricesBlock} .product-pack-price span`;
     this.productPrice = `${this.productPricesBlock} .current-price span`;
     this.taxShippingDeliveryBlock = `${this.productPricesBlock} div.tax-shipping-delivery-label`;
     this.deliveryInformationSpan = `${this.taxShippingDeliveryBlock} span.delivery-information`;
@@ -246,7 +249,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<boolean>}
    */
-  isProductTagVisible(page: Page): Promise<boolean> {
+  async isProductTagVisible(page: Page): Promise<boolean> {
     return this.elementVisible(page, this.productFlag);
   }
 
@@ -260,7 +263,9 @@ class Product extends FOBasePage {
       name: await this.getTextContent(page, this.productName),
       price: await this.getPriceFromText(page, this.productPrice),
       summary: await this.getTextContent(page, this.shortDescription, false),
-      description: await this.getTextContent(page, this.productDescription),
+      description: (await page.locator(`${this.productDescription}:visible`).count())
+        ? await this.getTextContent(page, this.productDescription)
+        : '',
     };
   }
 
@@ -274,11 +279,14 @@ class Product extends FOBasePage {
     image: string | null, quantity: number,
     price: string, name: string
   }> {
+    // Add +1 due to span before the article
+    const productIdentifier: number = productInList + 1;
+
     return {
-      image: await this.getAttributeContent(page, this.productInPackImage(productInList), 'src'),
-      name: await this.getTextContent(page, this.productInPackName(productInList)),
-      price: await this.getTextContent(page, this.productInPackPrice(productInList)),
-      quantity: await this.getNumberFromText(page, this.productInPackQuantity(productInList)),
+      image: await this.getAttributeContent(page, this.productInPackImage(productIdentifier), 'src'),
+      name: await this.getTextContent(page, this.productInPackName(productIdentifier)),
+      price: await this.getTextContent(page, this.productInPackPrice(productIdentifier)),
+      quantity: await this.getNumberFromText(page, this.productInPackQuantity(productIdentifier)),
     };
   }
 
@@ -287,17 +295,26 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<number>}
    */
-  getRegularPrice(page: Page): Promise<number> {
+  async getRegularPrice(page: Page): Promise<number> {
     return this.getPriceFromText(page, this.regularPrice);
   }
 
+  /**
+   * Get the price of products in pack
+   * @param page {Page} Browser tab
+   * @returns {Promise<number>}
+   */
+  async getPackProductsPrice(page: Page): Promise<number> {
+    return this.getPriceFromText(page, this.packProductsPrice);
+  }
+
   /**
    * Get product attributes from a Ul selector
    * @param page {Page} Browser tab
    * @param ulSelector {string} Selector to locate the element
    * @returns {Promise<Array<string>>}
    */
-  getProductsAttributesFromUl(page: Page, ulSelector: string): Promise<Array<string | null>> {
+  async getProductsAttributesFromUl(page: Page, ulSelector: string): Promise<Array<string | null>> {
     return page.$$eval(`${ulSelector} li .attribute-name`, (all) => all.map((el) => el.textContent));
   }
 
@@ -381,7 +398,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getDiscountAmount(page: Page): Promise<string> {
+  async getDiscountAmount(page: Page): Promise<string> {
     return this.getTextContent(page, this.discountAmountSpan);
   }
 
@@ -390,7 +407,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @returns {Promise<string>}
    */
-  getDiscountPercentage(page: Page): Promise<string> {
+  async getDiscountPercentage(page: Page): Promise<string> {
     return this.getTextContent(page, this.discountPercentageSpan);
   }
 
@@ -399,7 +416,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {promise<string>}
    */
-  getProductAvailabilityLabel(page: Page): Promise<string> {
+  async getProductAvailabilityLabel(page: Page): Promise<string> {
     return this.getTextContent(page, this.productAvailability, false);
   }
 
@@ -408,7 +425,7 @@ class Product extends FOBasePage {
    * @param page {Page} Browser tab
    * @return {Promise<string>}
    */
-  getDeliveryInformationText(page: Page): Promise<string> {
+  async getDeliveryInformationText(page: Page): Promise<string> {
     return this.getTextContent(page, this.deliveryInformationSpan);
   }
 

tests/UI/pages/commonPage.ts

@@ -346,7 +346,7 @@ export default class CommonPage {
   async getNumberFromText(page: Page | Frame, selector: string, timeout: number = 0): Promise<number> {
     await page.waitForTimeout(timeout);
     const text = await this.getTextContent(page, selector, false);
-    const number = (/\d+/g.exec(text) ?? '').toString();
+    const number = (/-?\d+/g.exec(text) ?? '').toString();
 
     return parseInt(number, 10);
   }

tests/UI/utils/basicHelper.ts

@@ -57,4 +57,13 @@ export default {
 
     return age;
   },
+
+  /**
+   * Make a string's first character uppercase
+   * @param value {string}
+   * @returns {string}
+   */
+  capitalize(value: string): string {
+    return value.charAt(0).toUpperCase() + value.slice(1);
+  },
 };