Merge pull request #383 from Progi1984/fixUITests

Author: Progi1984

.github/workflows/ui-test.yml

@@ -104,6 +104,7 @@ jobs:
           name: playwright-logs-${{ matrix.PS_VERSION }}
           path: |
             tests/UI/reports/
+            tests/UI/test-results/
             tests/UI/docker-compose.log
 
   nightly:

tests/UI/campaigns/01_installation/04_resetModule.spec.ts

@@ -5,15 +5,16 @@ import {
   dataCustomers,
   dataModules,
   dataProducts,
-  foClassicHomePage,
-  foClassicLoginPage,
-  foClassicModalWishlistPage,
-  foClassicMyWishlistsViewPage,
-  foClassicProductPage,
-  foClassicSearchResultsPage,
+  foHomePage,
+  foLoginPage,
+  foModalWishlistPage,
+  foMyWishlistsViewPage,
+  foProductPage,
+  foSearchResultsPage,
   modBlockwishlistBoMain,
   utilsTest,
 } from '@prestashop-core/ui-testing';
+import semver from 'semver';
 
 import { test, expect, Page, BrowserContext } from '@playwright/test';
 
@@ -64,6 +65,16 @@ test.describe('Wishlist module - Reset module', () => {
     expect(isModuleVisible).toBeTruthy();
   });
 
+  // >= 9.1.x : Hummingbird is enabled, but blockwishlist is disabled
+  if (semver.gte(utilsTest.getPSVersion(), '9.1.0')) {
+    test(`should enable the module ${dataModules.blockwishlist.name}`, async () => {
+      await utilsTest.addContextItem(test.info(), 'testIdentifier', 'searchModule', baseContext);
+
+      const textResult = await boModuleManagerPage.setActionInModule(page, dataModules.blockwishlist, 'enable');
+      expect(textResult).toEqual(boModuleManagerPage.enableModuleSuccessMessage(dataModules.blockwishlist.tag));
+    });
+  }
+
   test('should display the reset modal and cancel it', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'resetModuleAndCancel', baseContext);
 
@@ -109,53 +120,53 @@ test.describe('Wishlist module - Reset module', () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToFo', baseContext);
 
     page = await modBlockwishlistBoMain.viewMyShop(page);
-    await foClassicHomePage.changeLanguage(page, 'en');
+    await foHomePage.changeLanguage(page, 'en');
 
-    const isHomePage = await foClassicHomePage.isHomePage(page);
+    const isHomePage = await foHomePage.isHomePage(page);
     expect(isHomePage).toBeTruthy();
   });
 
   test('should go to login page', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToLoginPageFO', baseContext);
 
-    await foClassicHomePage.goToLoginPage(page);
+    await foHomePage.goToLoginPage(page);
 
-    const pageTitle = await foClassicLoginPage.getPageTitle(page);
-    expect(pageTitle).toContain(foClassicLoginPage.pageTitle);
+    const pageTitle = await foLoginPage.getPageTitle(page);
+    expect(pageTitle).toContain(foLoginPage.pageTitle);
   });
 
   test('should sign in with default customer', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'sighInFO', baseContext);
 
-    await foClassicLoginPage.customerLogin(page, dataCustomers.johnDoe);
+    await foLoginPage.customerLogin(page, dataCustomers.johnDoe);
 
-    const isCustomerConnected = await foClassicLoginPage.isCustomerConnected(page);
+    const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
     expect(isCustomerConnected).toBeTruthy();
   });
 
   test(`should search the product ${dataProducts.demo_3.name}`, async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'searchProductDemo3', baseContext);
 
-    await foClassicMyWishlistsViewPage.searchProduct(page, dataProducts.demo_3.name);
-    await foClassicSearchResultsPage.goToProductPage(page, 1);
+    await foMyWishlistsViewPage.searchProduct(page, dataProducts.demo_3.name);
+    await foSearchResultsPage.goToProductPage(page, 1);
 
-    const pageTitle = await foClassicProductPage.getPageTitle(page);
+    const pageTitle = await foProductPage.getPageTitle(page);
     expect(pageTitle).toEqual(dataProducts.demo_3.name);
   });
 
   test('should add to the wishlist and get the label', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'addToWishlist1', baseContext);
 
-    await foClassicProductPage.clickAddToWishlistButton(page);
+    await foProductPage.clickAddToWishlistButton(page);
 
-    const textResult = await foClassicModalWishlistPage.getModalAddToCreateWislistLabel(page);
+    const textResult = await foModalWishlistPage.getModalAddToCreateWislistLabel(page);
     expect(textResult).toContain(labelButton);
   });
 
   test('should return to \'Modules > Module Manager\' page', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToModuleManagerPageForReset', baseContext);
 
-    page = await foClassicModalWishlistPage.changePage(browserContext, 0);
+    page = await foModalWishlistPage.changePage(browserContext, 0);
     await boDashboardPage.goToSubMenu(
       page,
       boDashboardPage.modulesParentLink,
@@ -185,10 +196,10 @@ test.describe('Wishlist module - Reset module', () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'addToWishlist2', baseContext);
 
     page = await boModuleManagerPage.changePage(browserContext, 1);
-    await foClassicProductPage.reloadPage(page);
-    await foClassicProductPage.clickAddToWishlistButton(page);
+    await foProductPage.reloadPage(page);
+    await foProductPage.clickAddToWishlistButton(page);
 
-    const textResult = await foClassicModalWishlistPage.getModalAddToCreateWislistLabel(page);
+    const textResult = await foModalWishlistPage.getModalAddToCreateWislistLabel(page);
     expect(textResult).toContain(modBlockwishlistBoMain.defaultValueCreateButtonLabel);
   });
 });

tests/UI/campaigns/01_installation/05_uninstallAndDeleteModule.spec.ts

@@ -4,8 +4,8 @@ import {
   boModuleManagerPage,
   dataModules,
   dataProducts,
-  foClassicHomePage,
-  foClassicProductPage,
+  foHomePage,
+  foProductPage,
   utilsFile,
   utilsTest,
 } from '@prestashop-core/ui-testing';
@@ -92,18 +92,18 @@ test.describe('Wishlist module - Uninstall and delete module', () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'viewMyShop', baseContext);
 
     page = await boModuleManagerPage.viewMyShop(page);
-    await foClassicHomePage.changeLanguage(page, 'en');
+    await foHomePage.changeLanguage(page, 'en');
 
-    const isHomePage = await foClassicHomePage.isHomePage(page);
+    const isHomePage = await foHomePage.isHomePage(page);
     expect(isHomePage).toBeTruthy();
   });
 
   test('should go the product page', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToProductPage', baseContext);
 
-    await foClassicHomePage.goToProductPage(page, 1);
+    await foHomePage.goToProductPage(page, 1);
 
-    const productInformations = await foClassicProductPage.getProductInformation(page);
+    const productInformations = await foProductPage.getProductInformation(page);
     expect(productInformations.name).toEqual(dataProducts.demo_1.name);
   });
 
@@ -112,14 +112,14 @@ test.describe('Wishlist module - Uninstall and delete module', () => {
 
     test.skip(true, 'Can\'t be uninstalled as it is a volume in Docker');
 
-    const hasAddToWishlistButton = await foClassicProductPage.hasAddToWishlistButton(page);
+    const hasAddToWishlistButton = await foProductPage.hasAddToWishlistButton(page);
     expect(hasAddToWishlistButton).toBeFalsy();
   });
 
   test('should go back to Back Office', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'returnToModulesManager', baseContext);
 
-    page = await foClassicProductPage.closePage(browserContext, page, 0);
+    page = await foProductPage.closePage(browserContext, page, 0);
 
     test.skip(true, 'Can\'t be uninstalled as it is a volume in Docker');
     await boDashboardPage.goToSubMenu(

tests/UI/campaigns/02_configuration/02_statisticsTabSettings.spec.ts

@@ -7,9 +7,9 @@ import {
   dataCustomers,
   dataModules,
   // Import FO pages
-  foClassicCategoryPage,
-  foClassicHomePage,
-  foClassicLoginPage,
+  foCategoryPage,
+  foHomePage,
+  foLoginPage,
   // Import modules
   modBlockwishlistBoMain,
   modBlockwishlistBoStatistics,
@@ -98,36 +98,36 @@ test.describe('Wishlist module - Statistics tab settings', () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToFO', baseContext);
 
     page = await modBlockwishlistBoStatistics.viewMyShop(page);
-    await foClassicHomePage.changeLanguage(page, 'en');
+    await foHomePage.changeLanguage(page, 'en');
 
-    const isHomePage = await foClassicHomePage.isHomePage(page);
+    const isHomePage = await foHomePage.isHomePage(page);
     expect(isHomePage).toEqual(true);
   });
 
   test('should go to login page', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToLoginPage', baseContext);
 
-    await foClassicHomePage.goToLoginPage(page);
+    await foHomePage.goToLoginPage(page);
 
-    const pageTitle = await foClassicLoginPage.getPageTitle(page);
-    expect(pageTitle, 'Fail to open FO login page').toContain(foClassicLoginPage.pageTitle);
+    const pageTitle = await foLoginPage.getPageTitle(page);
+    expect(pageTitle, 'Fail to open FO login page').toContain(foLoginPage.pageTitle);
   });
 
   test('should sign in with default customer', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'sighInFo', baseContext);
 
-    await foClassicLoginPage.customerLogin(page, dataCustomers.johnDoe);
+    await foLoginPage.customerLogin(page, dataCustomers.johnDoe);
 
-    const isCustomerConnected = await foClassicLoginPage.isCustomerConnected(page);
+    const isCustomerConnected = await foLoginPage.isCustomerConnected(page);
     expect(isCustomerConnected, 'Customer is not connected').toEqual(true);
   });
 
   test('should go to all products page', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToAllProducts', baseContext);
 
-    await foClassicHomePage.goToAllProductsPage(page);
+    await foHomePage.goToAllProductsPage(page);
 
-    const isCategoryPageVisible = await foClassicCategoryPage.isCategoryPage(page);
+    const isCategoryPageVisible = await foCategoryPage.isCategoryPage(page);
     expect(isCategoryPageVisible).toEqual(true);
   });
 
@@ -136,27 +136,27 @@ test.describe('Wishlist module - Statistics tab settings', () => {
       test(`should add product #${idxProduct} to wishlist`, async () => {
         await utilsTest.addContextItem(test.info(), 'testIdentifier', `addToFavorite${idxProduct}`, baseContext);
 
-        const textResult = await foClassicCategoryPage.addToWishList(page, idxProduct);
-        expect(textResult).toEqual(foClassicCategoryPage.messageAddedToWishlist);
+        const textResult = await foCategoryPage.addToWishList(page, idxProduct);
+        expect(textResult).toEqual(foCategoryPage.messageAddedToWishlist);
 
-        const isAddedToWishlist = await foClassicCategoryPage.isAddedToWishlist(page, idxProduct);
+        const isAddedToWishlist = await foCategoryPage.isAddedToWishlist(page, idxProduct);
         expect(isAddedToWishlist).toEqual(true);
       });
     }
 
   test('should logout', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'foLogout', baseContext);
 
-    await foClassicCategoryPage.logout(page);
+    await foCategoryPage.logout(page);
 
-    const isCustomerConnected = await foClassicHomePage.isCustomerConnected(page);
+    const isCustomerConnected = await foHomePage.isCustomerConnected(page);
     expect(isCustomerConnected).toEqual(false);
   });
 
   test('should go to BO', async () => {
     await utilsTest.addContextItem(test.info(), 'testIdentifier', 'goToBoBack', baseContext);
 
-    page = await foClassicHomePage.closePage(browserContext, page, 0);
+    page = await foHomePage.closePage(browserContext, page, 0);
 
     const pageTitle = await modBlockwishlistBoStatistics.getPageTitle(page);
     expect(pageTitle).toContain(modBlockwishlistBoStatistics.pageTitle);