small changes

Author: Romarionijim

helpers/optionalParamsInterfaces/OptionalParams.ts

@@ -34,7 +34,15 @@ export interface ClientSideValiationErrorOptionalParamsInterface {
 
 
 export interface UserShippingDetailsParams {
-  company?: string, streetAddress?: string, streetFieldindex?: number, city?: string, state?: string,
-  postalCode?: string, country?: string, phoneNumber?: string, shippingMethod?: string, firstname?: string,
+  company?: string,
+  streetAddress?: string,
+  streetFieldIndex?: number,
+  city?: string,
+  state?: string,
+  postalCode?: string,
+  country?: string,
+  phoneNumber?: string,
+  shippingMethod?: string,
+  firstname?: string,
   lastname?: string
 }

pages/checkoutPage/CheckOutShippingPage.ts

@@ -37,28 +37,25 @@ export class CheckoutShippingPage extends LumaMainPage {
     if (options?.signIn && options.email !== undefined && options.password !== undefined) {
       await this.signIn(options.email, options.password)
       await this.page.waitForTimeout(2500);
-      const existingUserAddressDetails = this.page.locator(this.existingAddressLocator);
-      const isUserAddressDetailsVisibile = await existingUserAddressDetails.isVisible()
-      if (!isUserAddressDetailsVisibile) {
-        await this.fillCompanyName(options.company!);
-        await this.fillStreetAddress(options.streetFieldindex!, options.streetAddress!);
-        await this.fillCityName(options.city!);
-        await this.selectState(options.state!)
-        await this.fillPostalCode(options.postalCode!);
-        await this.selectCountry(options.country!);
-        await this.fillPhoneNumber(options.phoneNumber!);
-        await this.chooseShippingMethod(options.shippingMethod!);
-      } else {
-        const addressDetails = await this.getAddressDetailsList();
-        expect(addressDetails).toEqual(options.expectedUserAddressDetails);
-      }
-      await this.chooseShippingMethod(options.shippingMethod!)
     } else if (options?.email !== undefined && options.firstname !== undefined && options.lastname !== undefined) {
       await this.fillEmailAddress(options?.email!);
       await this.fillFirstName(options?.firstname!);
       await this.fillLastName(options?.lastname!);
+    }
+    const existingUserAddressDetails = this.page.locator(this.existingAddressLocator);
+    const isUserAddressDetailsVisibile = await existingUserAddressDetails.isVisible()
+    if (isUserAddressDetailsVisibile) {
+      const addressDetails = await this.getAddressDetailsList();
+      expect(addressDetails).toEqual(options?.expectedUserAddressDetails);
     } else {
-      throw new Error('none of the conditions were satisfied in the fillShippingDetails function')
+      await this.fillCompanyName(options?.company!);
+      await this.fillStreetAddress(options?.streetFieldIndex!, options?.streetAddress!);
+      await this.fillCityName(options?.city!);
+      await this.selectState(options?.state!)
+      await this.fillPostalCode(options?.postalCode!);
+      await this.selectCountry(options?.country!);
+      await this.fillPhoneNumber(options?.phoneNumber!);
+      await this.chooseShippingMethod(options?.shippingMethod!);
     }
   }
 

pages/checkoutPage/CheckoutReviewAndPaymentPage.ts

@@ -17,7 +17,8 @@ export class CheckoutReviewAndPaymentPage extends LumaMainPage {
   public async validateBillingAndShippingDetails(billingShippingDetails: string[]) {
     const shippingDetailsInnerText = await this.getInnerText(this.billingAddressDetailsLocator);
     const shippingDetailsList = shippingDetailsInnerText.split('\n')
-    expect(shippingDetailsList).toContain(billingShippingDetails);
+    shippingDetailsList.splice(shippingDetailsList.indexOf('edit'), 5);
+    expect(shippingDetailsList).toEqual(billingShippingDetails);
   }
 
   public async validateOrderSummaryExpenses(tableRowText: string, expectedOrderTotal: string) {

tests/menCategoryShopping/BuyFilteredProductFromMenCategory.spec.ts

@@ -25,6 +25,7 @@ test('purchase product from specific category', { tag: ['@MEN_CATEGORY_SHOPPING'
   let phoneNumber: string = Randomizer.getRandomPhoneNumber();
   let shippingMethod: string = 'Best Way';
   let purchaseConfirmation: string = 'Thank you for your purchase!';
+  let streetFieldIndex: number = 0;
 
   await test.step('choose men category then hover over men tops and click on jackets', async () => {
     await menCategoryPage.chooseMenuBarOption(MenuBar.MEN);
@@ -43,9 +44,9 @@ test('purchase product from specific category', { tag: ['@MEN_CATEGORY_SHOPPING'
     await menCategoryPage.performActionsOnShoppingCart({ cartTotalItems: cartQuantity, clickProceedToCheckout: true })
   })
   await test.step('fill shipping details, choose shipping method and click on next for payment address validation', async () => {
-    await checkoutShippingPage.fillShippingDetails({ email, firstname, lastname, country, company, streetAddress, city, state, postalCode, phoneNumber, shippingMethod });
+    await checkoutShippingPage.fillShippingDetails({ email, firstname, lastname, country, company, streetFieldIndex: streetFieldIndex, streetAddress, city, state, postalCode, phoneNumber, shippingMethod });
     await checkoutShippingPage.clickNext();
-    await checkoutPaymentPage.validateBillingAndShippingDetails([`${firstname} ${lastname}`, streetAddress, `${city}, ${state} ${postalCode}`, country, phoneNumber])
+    await checkoutPaymentPage.validateBillingAndShippingDetails([`${firstname} ${lastname}`, streetAddress,  `${city}, ${state} ${postalCode}`, country, phoneNumber])
   })
   await test.step('place order and validate order was successful', async () => {
     await checkoutPaymentPage.clickPlaceOrder();