Merge pull request #244 from nesrineabdmouleh/addMethodsInCartPage

Add methods in cart page and Adapt sanity tests with 1.7.2

Author: nesrineabdmouleh

src/data/demo/categories.ts

@@ -13,7 +13,7 @@ const women: FakerCategory = new FakerCategory({
   id: 5,
   name: 'Women',
   description: 'T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, '
-        + 'for every style.',
+    + 'for every style.',
   position: 2,
   displayed: true,
   products: ['demo_3'],
@@ -39,7 +39,7 @@ const clothes: FakerCategory = new FakerCategory({
   id: 3,
   name: 'Clothes',
   description: 'Discover our favorites fashionable discoveries, a selection of cool items to integrate in your '
-          + 'wardrobe. Compose a unique style with personality which matches your own.',
+    + 'wardrobe. Compose a unique style with personality which matches your own.',
   position: 1,
   displayed: true,
   children: [
@@ -68,6 +68,24 @@ const art: FakerCategory = new FakerCategory({
   displayed: true,
   products: ['demo_5', 'demo_6', 'demo_7', 'demo_18', 'demo_19', 'demo_20'],
 });
+// Categories demo for PS version <= 1.7.2
+//@todo : to find for a solution in case of upgrade 1.7.2 to 1.7.8
+const oldWomen: FakerCategory = new FakerCategory({
+  id: 3,
+  name: 'Women',
+  description: 'You will find here all woman fashion collections. This category includes all the basics of your '
+    + 'wardrobe and much more: shoes, accessories, printed t-shirts, feminine dresses, women\'s jeans!\'',
+  position: 1,
+  displayed: true,
+});
+//@todo : to find for a solution in case of upgrade 1.7.2 to 1.7.8
+const eveningDresses: FakerCategory = new FakerCategory({
+  id: 10,
+  name: 'Evening Dresses',
+  description: 'Browse our different dresses to choose the perfect dress for an unforgettable evening!',
+  position: 2,
+  displayed: true,
+});
 
 export default {
   home: new FakerCategory({
@@ -90,4 +108,6 @@ export default {
   stationery,
   homeAccessories,
   art,
+  oldWomen,
+  eveningDresses,
 };

src/data/demo/products.ts

@@ -9,9 +9,9 @@ export default {
     category: 'Men',
     summary: 'Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.',
     description: 'Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' '
-            + 'PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese '
-            + 'origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional '
-            + 'color rendering and a color, guaranteed overtime.',
+      + 'PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese '
+      + 'origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional '
+      + 'color rendering and a color, guaranteed overtime.',
     retailPrice: 28.68,
     tax: 20,
     price: 23.90,
@@ -245,4 +245,58 @@ export default {
     category: 'Home Accessories',
     status: true,
   }),
+  // Products demo for PS version <= 1.7.2
+  //@todo : to find for a solution in case of upgrade 1.7.2 to 1.7.8
+  old_demo_1: new FakerProduct({
+    id: 1,
+    name: 'Faded Short Sleeves T-shirt',
+    description: 'Fashion has been creating well-designed collections since 2010.',
+    finalPrice: 19.81,
+    reference: 'demo_1',
+    category: 'T-shirts',
+    status: true,
+  }),
+  old_demo_2: new FakerProduct({
+    id: 2,
+    name: 'Blouse',
+    finalPrice: 32.39,
+    reference: 'demo_2',
+    category: 'Blouses',
+    status: true,
+  }),
+  old_demo_3: new FakerProduct({
+    id: 3,
+    name: 'Printed Dress',
+    reference: 'demo_3',
+    category: 'Casual Dresses',
+    status: true,
+  }),
+  old_demo_4: new FakerProduct({
+    id: 4,
+    name: 'Printed Dress',
+    reference: 'demo_4',
+    category: 'Evening Dresses',
+    status: true,
+  }),
+  old_demo_5: new FakerProduct({
+    id: 5,
+    name: 'Printed Summer Dress',
+    reference: 'demo_5',
+    category: 'Summer Dresses',
+    status: true,
+  }),
+  old_demo_6: new FakerProduct({
+    id: 6,
+    name: 'Printed Summer Dress',
+    reference: 'demo_6',
+    category: 'Summer Dresses',
+    status: true,
+  }),
+  old_demo_7: new FakerProduct({
+    id: 7,
+    name: 'Printed Chiffon Dress',
+    reference: 'demo_7',
+    category: 'Summer Dresses',
+    status: true,
+  }),
 };

src/interfaces/FO/cart/index.ts

@@ -36,6 +36,9 @@ export interface FoCartPageInterface extends FOBasePagePageInterface {
     getProductAttributes(page: Page, row: number): Promise<ProductAttribute[]>;
     getProductCustomizationModal(page: Page, row?: number): Promise<string>;
     getProductDetail(page: Page, row: number): Promise<ProductDetailsWithDiscount>;
+    getProductName(page: Page, row: number): Promise<string>;
+    getProductPrice(page: Page, row: number): Promise<number>;
+    getProductQuantity(page: Page, row: number): Promise<number>;
     getProductsNumber(page: Page): Promise<number>;
     getSubtotalDiscountValue(page: Page): Promise<number>;
     isAlertWarningForMinimumPurchaseVisible(page: Page): Promise<boolean>;

src/pages/BO/catalog/products/create/index.ts

@@ -6,6 +6,9 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOProductsCreatePageInterface {
+  if (semver.lt(psVersion, '7.3.0')) {
+    return require('@versions/1.7.2/pages/BO/catalog/products/create').createProduct;
+  }
   if (semver.lt(psVersion, '7.4.0')) {
     return require('@versions/1.7.3/pages/BO/catalog/products/create').createProduct;
   }

src/pages/BO/catalog/products/index.ts

@@ -6,6 +6,9 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOProductsPageInterface {
+  if (semver.lt(psVersion, '7.3.0')) {
+    return require('@versions/1.7.2/pages/BO/catalog/products').productsPage;
+  }
   if (semver.lt(psVersion, '7.4.0')) {
     return require('@versions/1.7.3/pages/BO/catalog/products').productsPage;
   }

src/pages/BO/login/index.ts

@@ -6,8 +6,11 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): LoginPageInterface {
+  if (semver.lt(psVersion, '7.3.0')) {
+    return require('@versions/1.7.2/pages/BO/login').loginPage;
+  }
   if (semver.lt(psVersion, '8.0.0')) {
-    return require('@versions/1.7.8/pages/BO/login');
+    return require('@versions/1.7.8/pages/BO/login').loginPage;
   }
   if (semver.lt(psVersion, '9.0.0')) {
     return require('@versions/8.1/pages/BO/login').loginPage;

src/pages/BO/orders/index.ts

@@ -6,6 +6,9 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOOrdersPageInterface {
+  if (semver.lt(psVersion, '7.3.0')) {
+    return require('@versions/1.7.2/pages/BO/orders').ordersPage;
+  }
   if (semver.lt(psVersion, '7.7.0')) {
     return require('@versions/1.7.6/pages/BO/orders').ordersPage;
   }

src/pages/BO/orders/view/viewOrderBasePage.ts

@@ -5,6 +5,9 @@ import semver from 'semver';
 const psVersion = testContext.getPSVersion();
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): BOViewOrderBasePageInterface {
+  if (semver.lt(psVersion, '7.3.0')) {
+    return require('@versions/1.7.2/pages/BO/orders/view/viewOrderBasePage').viewOrderBasePage;
+  }
   if (semver.lt(psVersion, '7.7.0')) {
     return require('@versions/1.7.6/pages/BO/orders/view/viewOrderBasePage').viewOrderBasePage;
   }

src/pages/FO/FOBasePage.ts

@@ -529,7 +529,8 @@ export default class FOBasePage extends CommonPage implements FOBasePagePageInte
    */
   async goToSubCategory(page: Page, categoryID: number, subCategoryID: number): Promise<void> {
     await page.locator(this.categoryMenu(categoryID)).first().hover();
-    await this.clickAndWaitForURL(page, this.categoryMenu(subCategoryID));
+    await page.locator(this.categoryMenu(subCategoryID)).click();
+    await page.waitForLoadState();
   }
 
   /**

src/pages/FO/classic/login/index.ts

@@ -6,11 +6,12 @@ const psVersion = testContext.getPSVersion();
 
 /* eslint-disable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 function requirePage(): FoLoginPageInterface {
-  if (semver.gte(psVersion, '0.0.0')) {
-    return require('@versions/develop/pages/FO/classic/login').loginPage;
+  if (semver.lte(psVersion, '7.3.0')) {
+    return require('@versions/1.7.2/pages/FO/classic/login').loginPage;
   }
   return require('@versions/develop/pages/FO/classic/login').loginPage;
 }
+
 /* eslint-enable global-require, @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires */
 
 export default requirePage();