Merge pull request #991 from tblivet/chore/update-ui-test

Update Hummingbird v2.1.0 UI Test

Author: Progi1984

src/pages/FO/hummingbird/modal/quickView.ts

@@ -9,6 +9,9 @@ function requirePage(): FoModalQuickViewPageInterface {
   if (semver.lt(psVersion, '9.1.0')) {
     return require('@versions/9.0/pages/FO/hummingbird/modal/quickView').foModalQuickViewPage;
   }
+  if (semver.lt(psVersion, '9.2.0')) {
+    return require('@versions/9.1/pages/FO/hummingbird/modal/quickView').foModalQuickViewPage;
+  }
   return require('@versions/develop/pages/FO/hummingbird/modal/quickView').foModalQuickViewPage;
 }
 /* eslint-enable global-require, @typescript-eslint/no-require-imports */

src/pages/FO/hummingbird/myAccount/index.ts

@@ -9,6 +9,9 @@ function requirePage(): FoMyAccountPageInterface {
   if (semver.lt(psVersion, '9.1.0')) {
     return require('@versions/9.0/pages/FO/hummingbird/myAccount').foMyAccountPage;
   }
+  if (semver.lt(psVersion, '9.2.0')) {
+    return require('@versions/9.1/pages/FO/hummingbird/myAccount').foMyAccountPage;
+  }
   return require('@versions/develop/pages/FO/hummingbird/myAccount').myAccountPage;
 }
 /* eslint-enable global-require, @typescript-eslint/no-require-imports */

src/pages/FO/hummingbird/product/index.ts

@@ -9,6 +9,9 @@ function requirePage(): FoProductHummingbirdPageInterface {
   if (semver.lt(psVersion, '9.1.0')) {
     return require('@versions/9.0/pages/FO/hummingbird/product').foProductPage;
   }
+  if (semver.lt(psVersion, '9.2.0')) {
+    return require('@versions/9.1/pages/FO/hummingbird/product').foProductPage;
+  }
   return require('@versions/develop/pages/FO/hummingbird/product').foProductPage;
 }
 /* eslint-enable global-require, @typescript-eslint/no-require-imports */

src/versions/9.1/pages/FO/hummingbird/modal/quickView.ts

@@ -0,0 +1,26 @@
+import {type FoModalQuickViewPageInterface} from '@interfaces/FO/modal/quickView';
+import {FoModalQuickViewPage as FoModalQuickViewPageVersion} from '@versions/develop/pages/FO/hummingbird/modal/quickView';
+
+/**
+ * Quick view modal, contains functions that can be used on the page
+ * @class
+ * @extends FoModalQuickViewPageVersion
+ */
+class FoModalQuickViewPage extends FoModalQuickViewPageVersion implements FoModalQuickViewPageInterface {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on quick view modal
+   */
+  constructor() {
+    super();
+
+    // Quick view modal
+    // Before Hummingbird wrapped each thumbnail button in `li.product__thumbnails-item`,
+    // the button was a direct child of `ul.product__thumbnails-list`.
+    this.quickViewThumbImagePosition = (position: number) => `${this.quickViewModalDiv} ul.product__thumbnails-list `
+      + `button:nth-child(${position}) img`;
+  }
+}
+
+const foModalQuickViewPage = new FoModalQuickViewPage();
+export {foModalQuickViewPage, FoModalQuickViewPage};

src/versions/9.1/pages/FO/hummingbird/myAccount/index.ts

@@ -0,0 +1,24 @@
+import {FoMyAccountPageInterface} from '@interfaces/FO/myAccount';
+import {MyAccountPage as MyAccountPageVersion} from '@versions/develop/pages/FO/hummingbird/myAccount';
+
+/**
+ * My account page, contains functions that can be used on the page
+ * @class
+ * @extends MyAccountPageVersion
+ */
+class FoMyAccountPage extends MyAccountPageVersion implements FoMyAccountPageInterface {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on my account page
+   */
+  constructor() {
+    super();
+
+    // Selectors
+    this.myWishlistsLink = '.account-menu__nav #wishlist_link';
+    this.psgdprLink = '.account-menu__nav #psgdpr_link';
+  }
+}
+
+const foMyAccountPage = new FoMyAccountPage();
+export {foMyAccountPage, FoMyAccountPage};

src/versions/9.1/pages/FO/hummingbird/product/index.ts

@@ -0,0 +1,25 @@
+import {type FoProductHummingbirdPageInterface} from '@interfaces/FO/product';
+import {FoProductPage as FoProductPageVersion} from '@versions/develop/pages/FO/hummingbird/product';
+
+/**
+ * Product page, contains functions that can be used on the page
+ * @class
+ * @extends FoProductPageVersion
+ */
+class FoProductPage extends FoProductPageVersion implements FoProductHummingbirdPageInterface {
+  /**
+   * @constructs
+   * Setting up texts and selectors to use on product page
+   */
+  constructor() {
+    super();
+
+    // Before Hummingbird wrapped each thumbnail button in `li.product__thumbnails-item`,
+    // the button (`.product__thumbnail`) was a direct child of `ul.product__thumbnails-list`.
+    this.productImageRow = (row: number) => '.product__images .product__thumbnails-list '
+      + `.product__thumbnail:nth-child(${row})`;
+  }
+}
+
+const foProductPage = new FoProductPage();
+export {foProductPage, FoProductPage};

src/versions/develop/pages/FO/hummingbird/modal/quickView.ts

@@ -34,7 +34,7 @@ class FoModalQuickViewPage extends FoModalQuickViewPageClassic implements FoModa
     this.quickViewProductColor = `${this.quickViewProductVariants} div[id^="group_2"]`;
     this.quickViewCloseButton = `${this.quickViewModalDiv} .quickview__header button.btn-close`;
     this.quickViewThumbImagePosition = (position: number) => `${this.quickViewModalDiv} ul.product__thumbnails-list `
-      + `button:nth-child(${position}) img`;
+      + `li.product__thumbnails-item:nth-child(${position}) button img`;
   }
 
   /**

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

@@ -24,8 +24,8 @@ class MyAccountPage extends MyAccountPageVersion implements FoMyAccountPageInter
     this.orderSlipsLink = '#order-slips_link';
     this.successMessageAlert = 'div.alert';
     this.logoutFooterLink = '#footer_customeraccountlinks a.logout';
-    this.myWishlistsLink = '.account-menu__nav #wishlist_link';
-    this.psgdprLink = '.account-menu__nav #psgdpr_link';
+    this.myWishlistsLink = '.account-menu__nav .account-menu__link--wishlist';
+    this.psgdprLink = '.account-menu__nav .account-menu__link--psgdpr';
   }
 }
 

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

@@ -47,7 +47,8 @@ class FoProductPage extends FoProductPageClassic implements FoProductHummingbird
     this.productCoverImgProductModal = `${this.productCarouselImageItem}.active img`;
     this.carouselControlProductModal = (direction: string) => '#product-modal .product-images-modal__body'
       + ` button.carousel-control-${direction}`;
-    this.productImageRow = (row: number) => `.product__images .product__thumbnails-list .product__thumbnail:nth-child(${row})`;
+    this.productImageRow = (row: number) => '.product__images .product__thumbnails-list '
+      + `.product__thumbnails-item:nth-child(${row}) .product__thumbnail`;
     this.thumbImg = (row: number) => `${this.productImageRow(row)} picture img.js-thumb`;
     this.zoomIcon = '.product__images .product__carousel .product__zoom';
     this.productName = '#wrapper .product__name';