Merge pull request #190 from Progi1984/fix

Bump `@playwright/test` to `1.48.0`: Fixed some errors

Author: Progi1984

.github/workflows/checks.yml

@@ -2,6 +2,9 @@ name: Lint And Typescript Checks
 
 on:
   pull_request:
+  push:
+    branches:
+      - main
 
 env:
   NODE_VERSION: '16'

Makefile

@@ -11,4 +11,10 @@ test: ## Build and copy to the dependencies directory for the project
 	cp -r dist $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/
 	cp package.json $(filter-out $@,$(MAKECMDGOALS))/tests/UI/node_modules/@prestashop-core/ui-testing/
 
+gitclean: ## Rebase & Clean git
+	git fetch upstream
+	git rebase "upstream/main"
+	git push origin
+	git fetch --prune
+
 .DEFAULT_GOAL := help

package-lock.json

@@ -29,7 +29,7 @@
   "homepage": "https://github.com/PrestaShop/ui-testing-library#readme",
   "dependencies": {
     "@faker-js/faker": "^8.3.1",
-    "@playwright/test": "^1.48.0",
+    "@playwright/test": "^1.48.1",
     "@s3pweb/keycloak-admin-client-cjs": "^22.0.1",
     "@xmldom/xmldom": "^0.8.10",
     "csv-writer": "^1.6.0",

package.json

@@ -769,7 +769,10 @@ class ProductsPage extends BOBasePage implements BOProductsPageInterface {
    */
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
-      await this.clickAndWaitForURL(page, this.filterResetButton);
+      // Move the mouse to avoid the tooltip on first row
+      await page.mouse.move(0, 0);
+      await this.clickAndWaitForLoadState(page, this.filterResetButton);
+      await this.waitForHiddenSelector(page, this.filterResetButton, 2000);
     }
   }
 

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

@@ -157,7 +157,9 @@ class BOLanguagesPage extends BOBasePage implements BOLanguagesPageInterface {
   async resetFilter(page: Page): Promise<void> {
     if (!(await this.elementNotVisible(page, this.filterResetButton, 2000))) {
       await this.clickAndWaitForLoadState(page, this.filterResetButton);
-      await this.elementNotVisible(page, this.filterResetButton, 2000);
+      // Move the mouse to avoid the tooltip on first row
+      await page.mouse.move(0, 0);
+      await this.waitForHiddenSelector(page, this.filterResetButton, 2000);
     }
   }
 
@@ -202,7 +204,8 @@ class BOLanguagesPage extends BOBasePage implements BOLanguagesPageInterface {
       // Do nothing
     }
     // click on search
-    await this.clickAndWaitForURL(page, this.filterSearchButton);
+    await page.locator(this.filterSearchButton).click();
+    await this.waitForVisibleSelector(page, this.filterResetButton);
   }
 
   /* Table methods */

src/versions/develop/pages/BO/international/languages/index.ts

@@ -25,7 +25,7 @@ class PsGdprTabDataConsentPage extends ModuleConfiguration implements ModulePsGd
 
   private readonly checkboxModuleForm: (status: boolean) => string;
 
-  private readonly messageModuleForm: (nth: number) => string;
+  private readonly messageModuleForm: (nth: number, idLang: number) => string;
 
   private readonly saveButton: string;
 
@@ -45,8 +45,8 @@ class PsGdprTabDataConsentPage extends ModuleConfiguration implements ModulePsGd
       + ' button.dropdown-toggle';
     this.btnDropdownItemLangModuleForm = (idLang: number) => `div.open ul.dropdown-menu a[data-id="${idLang}"]`;
     this.checkboxModuleForm = (status: boolean) => `input[id^="switch_registered_module_"]${status ? '.yes' : '.no'}`;
-    this.messageModuleForm = (nth: number) => `div:nth-child(${nth + 1} of [id^="registered_module_message"]) `
-      + 'div.translatable-field:not([style="display:none"]) iframe';
+    this.messageModuleForm = (nth: number, idLang: number) => `div:nth-child(${nth + 1} of [id^="registered_module_message"]) `
+      + `div.translatable-field:not([style="display:none"]) iframe[id$="_${idLang}_ifr"]`;
     this.saveButton = '#submitDataConsent';
   }
 
@@ -114,7 +114,7 @@ class PsGdprTabDataConsentPage extends ModuleConfiguration implements ModulePsGd
    */
   async setNewsletterMessage(page: Page, message: string): Promise<void> {
     await this.setTinyMCEInputValue(
-      page.locator(this.messageModuleForm(0)).contentFrame(),
+      page.locator(this.messageModuleForm(0, dataLanguages.english.id)).contentFrame(),
       message,
     );
   }
@@ -139,7 +139,7 @@ class PsGdprTabDataConsentPage extends ModuleConfiguration implements ModulePsGd
    */
   async setContactFormMessage(page: Page, message: string): Promise<void> {
     await this.setTinyMCEInputValue(
-      page.locator(this.messageModuleForm(2)).contentFrame(),
+      page.locator(this.messageModuleForm(2, dataLanguages.english.id)).contentFrame(),
       message,
     );
   }
@@ -164,7 +164,7 @@ class PsGdprTabDataConsentPage extends ModuleConfiguration implements ModulePsGd
    */
   async setProductCommentsMessage(page: Page, message: string): Promise<void> {
     await this.setTinyMCEInputValue(
-      page.locator(this.messageModuleForm(1)).contentFrame(),
+      page.locator(this.messageModuleForm(1, dataLanguages.english.id)).contentFrame(),
       message,
     );
   }
@@ -191,7 +191,8 @@ class PsGdprTabDataConsentPage extends ModuleConfiguration implements ModulePsGd
   async setMailAlertsMessage(page: Page, message: string, idLang: number = dataLanguages.english.id): Promise<void> {
     await page.locator(this.btnDropdownLangModuleForm).nth(3).click();
     await page.locator(this.btnDropdownItemLangModuleForm(idLang)).click();
-    await this.setTinyMCEInputValue(page.locator(this.messageModuleForm(3)).contentFrame(), message);
+    await this.waitForVisibleSelector(page, this.messageModuleForm(3, idLang), 10000);
+    await this.setTinyMCEInputValue(page.locator(this.messageModuleForm(3, idLang)).contentFrame(), message);
   }
 
   /**

src/versions/develop/pages/BO/modules/psgdpr/tabDataConsent.ts

@@ -45,8 +45,7 @@ class AddAliasPage extends BOBasePage implements BOAliasCreatePageInterface {
   async setAlias(page: Page, aliasData: FakerSearchAlias): Promise<string> {
     await this.setValue(page, this.aliasInput, aliasData.alias);
     await this.setValue(page, this.resultInput, aliasData.result);
-
-    await this.clickAndWaitForURL(page, this.saveButton);
+    await page.locator(this.saveButton).click();
     return this.getAlertSuccessBlockContent(page);
   }
 }

src/versions/develop/pages/BO/shopParameters/search/alias/create.ts

@@ -91,7 +91,7 @@ class CategoryPage extends FOBasePage implements FoCategoryPageInterface {
 
   protected closeOneFilter: (row: number) => string;
 
-  private readonly searchFilterPriceValues: string;
+  private readonly searchFilterPriceValues: (facetType: string, facetLabel: string) => string;
 
   protected clearAllFiltersLink: string;
 
@@ -172,8 +172,9 @@ class CategoryPage extends FOBasePage implements FoCategoryPageInterface {
     this.searchFiltersDropdown = (facetType: string, facetLabel: string) => `${this.searchFilter(facetType, facetLabel)
     } .facet-dropdown`;
     this.searchFiltersSlider = (facetType: string, facetLabel: string) => `${this.searchFilter(facetType, facetLabel)
-    }.faceted-slider`;
-    this.searchFilterPriceValues = '[id*=facet_label]';
+    }.faceted-slider .ui-slider`;
+    this.searchFilterPriceValues = (facetType: string, facetLabel: string) => `${this.searchFilter(facetType, facetLabel)} `
+      + '[id*=facet_label]';
     this.clearAllFiltersLink = '#_desktop_search_filters_clear_all button.js-search-filters-clear-all';
     this.activeSearchFilters = '#js-active-search-filters';
     this.closeOneFilter = (row: number) => `#js-active-search-filters ul li:nth-child(${row}) a i`;
@@ -607,7 +608,7 @@ class CategoryPage extends FOBasePage implements FoCategoryPageInterface {
    * @return {Promise<number>}
    */
   async getMaximumPrice(page: Page): Promise<number> {
-    const test = await this.getTextContent(page, this.searchFilterPriceValues);
+    const test = await this.getTextContent(page, this.searchFilterPriceValues('price', 'Price'));
 
     return (parseInt(test.split('€')[2], 10));
   }
@@ -618,7 +619,7 @@ class CategoryPage extends FOBasePage implements FoCategoryPageInterface {
    * @return {Promise<number>}
    */
   async getMinimumPrice(page: Page): Promise<number> {
-    const test = await this.getTextContent(page, this.searchFilterPriceValues);
+    const test = await this.getTextContent(page, this.searchFilterPriceValues('price', 'Price'));
 
     return (parseInt(test.split('€')[1], 10));
   }

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

@@ -40,11 +40,13 @@ class CategoryPage extends CategoryPageVersion implements FoCategoryPageInterfac
     this.searchFiltersLabel = `${this.searchFilters} label.form-check-label`;
     this.clearAllFiltersLink = `${this.searchFilters} button.js-search-filters-clear-all`;
     this.searchFilterPriceSlider = 'div.faceted-slider';
-    this.searchFiltersSlider = () => `${this.searchFilters} div.faceted-slider`;
     this.closeOneFilter = (row: number) => `#js-active-search-filters ul li:nth-child(${row + 1}) a i`;
 
     // Pagination selectors
     this.pagesList = 'ul.pagination';
+
+    // Filter selectors
+    this.searchFiltersSlider = () => `${this.searchFilters} .faceted-slider`;
   }
 
   /**
@@ -88,6 +90,24 @@ class CategoryPage extends CategoryPageVersion implements FoCategoryPageInterfac
     await page.waitForTimeout(2000);
   }
 
+  /**
+   * Filter by price
+   * @param page {Page} Browser tab
+   * @param minPrice {number} Minimum price in the slider
+   * @param maxPrice {number} Maximum price in the slider
+   * @param filterFrom {number} The minimum value to filter
+   * @param filterTo {number} The maximum value to filter
+   * @return {Promise<void>}
+   */
+  async filterByPrice(page: Page, minPrice: number, maxPrice: number, filterFrom: number, filterTo: number): Promise<void> {
+    await page.locator(this.filterTypeButton('Price')).click();
+
+    await super.filterByPrice(page, minPrice, maxPrice, filterFrom, filterTo);
+
+    await page.locator(this.filterTypeButton('Price')).click();
+    await page.waitForTimeout(2000);
+  }
+
   /**
    * Get product href
    * @param page {Page} Browser tab