Merge pull request #793 from nesrineabdmouleh/addMultiCarrierSelectorsInFo

Add selectors to check multicarrier in FO

Author: nesrineabdmouleh

src/interfaces/FO/checkout/index.ts

@@ -53,6 +53,9 @@ export interface FoCheckoutPageInterface extends FOBasePagePageInterface {
     getNoPaymentNeededBlockContent(page: Page): Promise<string>;
     getNumberOfAddresses(page: Page): Promise<number>;
     getNumberOfInvoiceAddresses(page: Page): Promise<number>;
+    getOrderConfirmationCarrierInfo(page:Page, carrierRow: number):Promise<string>;
+    getOrderConfirmationProduct(page:Page, productRow:number):Promise<string>;
+    getOrderConfirmationVirtualInfo(page:Page, productRow:number):Promise<string>;
     getOrderMessage(page: Page): Promise<string>;
     getProductAttributes(page: Page, productRow: number): Promise<string>;
     getProductDetails(page: Page, productRow: number): Promise<ProductDetailsBasic>;

src/interfaces/FO/myAccount/orderDetails.ts

@@ -11,6 +11,7 @@ export interface FoMyOrderDetailsPageInterface extends FOBasePagePageInterface {
   clickOnReorderLink(page: Page): Promise<void>;
   downloadInvoice(page: Page): Promise<string | null>;
   getBoxMessages(page: Page): Promise<string>;
+  getCarrierDataFromTable(page: Page, row?: number, column?: string): Promise<string>;
   getDeliveryAddress(page: Page): Promise<string>;
   getInvoiceAddress(page: Page): Promise<string>;
   getProductName(page: Page, row?: number, column?: number): Promise<string>;

src/versions/develop/pages/FO/classic/checkout/index.ts

@@ -233,6 +233,12 @@ class CheckoutPage extends FOBasePage implements FoCheckoutPageInterface {
 
   private readonly invoiceAddressRadioButton: (addressID: number) => string;
 
+  protected carrierInfo: (carrierRow: number) => string;
+
+  protected productRow: (productRow: number) => string;
+
+  protected virtualProductRow: (productRow: number) => string;
+
   protected cartTotalATI: string;
 
   private readonly cartRuleAlertMessage: string;
@@ -398,6 +404,14 @@ class CheckoutPage extends FOBasePage implements FoCheckoutPageInterface {
     this.recyclableGiftCheckbox = '#input_recyclable';
     this.cartSubtotalGiftWrappingDiv = '#cart-subtotal-gift_wrapping';
     this.cartSubtotalGiftWrappingValueSpan = `${this.cartSubtotalGiftWrappingDiv} span.value`;
+
+    // Carrier info selectors
+    this.carrierInfo = (carrierRow: number) => `div.order-confirmation-table div:nth-child(${carrierRow})`
+      + ' div.details .carrier-name';
+    this.productRow = (productRow: number) => `div.order-confirmation-table div:nth-child(${productRow}) div.details a`
+      + `,div.order-confirmation-table div:nth-child(${productRow}) div.details span`;
+    this.virtualProductRow = (productRow: number) => `div.order-confirmation-table div:nth-child(${productRow})`
+      + ' div.details .virtual-info';
   }
 
   /*
@@ -1048,7 +1062,7 @@ class CheckoutPage extends FOBasePage implements FoCheckoutPageInterface {
    * @param page {Page} Browser tab
    * @returns {Promise<string|null>}
    */
-  async getCarrierErrorMessage(page: Page): Promise<string|null> {
+  async getCarrierErrorMessage(page: Page): Promise<string | null> {
     return page.locator(this.deliveryStepCarriersListError).textContent();
   }
 
@@ -1344,6 +1358,36 @@ class CheckoutPage extends FOBasePage implements FoCheckoutPageInterface {
 
     return this.getTextContent(page, this.cartSubtotalGiftWrappingValueSpan);
   }
+
+  /**
+   * Get order confirmation carrier info
+   * @param page {Page} Browser tab
+   * @param carrierRow {number}
+   * @returns {Promise<string>}
+   */
+  async getOrderConfirmationCarrierInfo(page: Page, carrierRow: number): Promise<string> {
+    return this.getTextContent(page, this.carrierInfo(carrierRow));
+  }
+
+  /**
+   * Get order confirmation product
+   * @param page {Page} Browser tab
+   * @param productRow {number}
+   * @returns {Promise<string>}
+   */
+  async getOrderConfirmationProduct(page: Page, productRow: number): Promise<string> {
+    return this.getTextContent(page, this.productRow(productRow));
+  }
+
+  /**
+   * Get order confirmation virtual info
+   * @param page {Page} Browser tab
+   * @param productRow {number}
+   * @returns {Promise<string>}
+   */
+  async getOrderConfirmationVirtualInfo(page: Page, productRow: number): Promise<string> {
+    return this.getTextContent(page, this.virtualProductRow(productRow));
+  }
 }
 
 const checkoutPage = new CheckoutPage();

src/versions/develop/pages/FO/classic/myAccount/orderDetails.ts

@@ -55,6 +55,12 @@ class MyOrderDetailsPage extends FOBasePage implements FoMyOrderDetailsPageInter
 
   private readonly invoiceAddressBox: string;
 
+  protected carrierGridTable: string;
+
+  protected carrierTableRow: (row: number) => string;
+
+  protected carrierTableBodyColumn: (row: number, columnName: string) => string;
+
   /**
    * @constructs
    * Setting up texts and selectors to use on order details page
@@ -76,6 +82,11 @@ class MyOrderDetailsPage extends FOBasePage implements FoMyOrderDetailsPageInter
     this.returnTextarea = `${this.orderReturnForm} textarea[name='returnText']`;
     this.requestReturnButton = `${this.orderReturnForm} button[name='submitReturnMerchandise']`;
 
+    // Shipment tracking details selectors
+    this.carrierGridTable = '';
+    this.carrierTableRow = (row: number) => `table.hidden-sm-down tbody tr:nth-child(${row})`;
+    this.carrierTableBodyColumn = (row: number, column: string) => `${this.carrierTableRow(row)} td:nth-child(${column})`;
+
     // Order products table body selectors
     this.tableBody = `${this.gridTable} tbody`;
     this.tableBodyRows = `${this.tableBody} tr`;
@@ -188,6 +199,17 @@ class MyOrderDetailsPage extends FOBasePage implements FoMyOrderDetailsPageInter
     return this.getTextContent(page, this.productName(row, column));
   }
 
+  /**
+   * Get carrier data from table
+   * @param page {Page} Browser tab
+   * @param row {number}
+   * @param column {string}
+   * @returns {Promise<string>}
+   */
+  async getCarrierDataFromTable(page: Page, row: number = 1, column: string = 'Carrier'): Promise<string> {
+    return this.getTextContent(page, this.carrierTableBodyColumn(row, column));
+  }
+
   /**
    * Click on download link
    * @param page {Page} Browser tab

src/versions/develop/pages/FO/hummingbird/checkout/index.ts

@@ -92,6 +92,10 @@ class FoCheckoutPage extends FoCheckoutPageClassic implements FoCheckoutPageInte
     this.productDetailsAttributes = (productRow: number) => `${this.productRowLink(productRow)} div`
       + '.cart-summary-product__attribute';
 
+    this.carrierInfo = (carrierRow: number) => `div.order-confirmation__carrier-info:nth-child(${carrierRow})`;
+    this.productRow = (productRow: number) => `div.order-confirmation__product:nth-child(${productRow})`;
+    this.virtualProductRow = (productRow: number) => `div.order-confirmation__virtual-info:nth-child(${productRow})`;
+
     // Gift selectors
     this.cartSubtotalGiftWrappingValueSpan = `${this.cartSubtotalGiftWrappingDiv} span.cart-summary__value`;
   }

src/versions/develop/pages/FO/hummingbird/myAccount/orderDetails.ts

@@ -33,6 +33,12 @@ class FoMyOrderDetailsPage extends FoMyOrderDetailsPageClassic implements FoMyOr
     this.boxMessagesBlock = 'div.order-message__content';
     this.reorderLink = '.order-infos__summary .order-infos__actions a[href*=\'order?submitReorder\']';
     this.invoiceLink = '.order-infos__summary .order-infos__actions a[href*=\'pdf-invoice\']';
+
+    // Shipment tracking details selectors
+    this.carrierGridTable = 'section.order-carriers';
+    this.carrierTableRow = (row: number) => `${this.carrierGridTable} div.grid-table__row:nth-child(${row + 1})`;
+    this.carrierTableBodyColumn = (row: number, columnName: string) => `${this.carrierTableRow(row)} `
+      + `span[data-ps-label='${columnName}']`;
   }
 }