Merge branch 'develop' of https://github.com/fdonnet/PrestaShop into …

…develop
PrestaShop · Feb 2, 2021 · 32a1c2d · 32a1c2d
2 parents 844910e + a4dc94f
commit 32a1c2d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/UI/campaigns/sanity/02_productsBO/02_CRUDStandardProductInBO.js b/tests/UI/campaigns/sanity/02_productsBO/02_CRUDStandardProductInBO.js
@@ -80,7 +80,7 @@ describe('Create, read, update and delete Standard product in BO', async () => {
 
     // Preview product in FO and get product information
     page = await addProductPage.previewProduct(page);
-    const result = await foProductPage.getProductInformation(page, productData);
+    const result = await foProductPage.getProductInformation(page);
 
     // Go back to BO
     page = await foProductPage.closePage(browserContext, page, 0);
@@ -104,7 +104,7 @@ describe('Create, read, update and delete Standard product in BO', async () => {
     await testContext.addContextItem(this, 'testIdentifier', 'previewProduct2', baseContext);
 
     page = await addProductPage.previewProduct(page);
-    const result = await foProductPage.getProductInformation(page, editedProductData);
+    const result = await foProductPage.getProductInformation(page);
 
     page = await foProductPage.closePage(browserContext, page, 0);
 

diff --git a/tests/UI/campaigns/sanity/02_productsBO/03_CRUDStandardProductWithCombinationsInBO.js b/tests/UI/campaigns/sanity/02_productsBO/03_CRUDStandardProductWithCombinationsInBO.js
@@ -82,7 +82,7 @@ describe('Create, read, update and delete Standard product with combinations in
     await testContext.addContextItem(this, 'testIdentifier', 'previewProduct1', baseContext);
 
     page = await addProductPage.previewProduct(page);
-    const result = await foProductPage.getProductInformation(page, productWithCombinations);
+    const result = await foProductPage.getProductInformation(page);
 
     page = await foProductPage.closePage(browserContext, page, 0);
 
@@ -109,7 +109,7 @@ describe('Create, read, update and delete Standard product with combinations in
     await testContext.addContextItem(this, 'testIdentifier', 'previewProduct2', baseContext);
 
     page = await addProductPage.previewProduct(page);
-    const result = await foProductPage.getProductInformation(page, editedProductWithCombinations);
+    const result = await foProductPage.getProductInformation(page);
 
     page = await foProductPage.closePage(browserContext, page, 0);
 

diff --git a/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.js b/tests/UI/campaigns/sanity/04_catalogFO/02_checkProduct.js
@@ -46,7 +46,7 @@ describe('Check the Product page', async () => {
 
   it('should check the product page', async function () {
     await testContext.addContextItem(this, 'testIdentifier', 'checkProductPage', baseContext);
-    const result = await productPage.getProductInformation(page, ProductData.firstProductData);
+    const result = await productPage.getProductInformation(page);
     await Promise.all([
       expect(result.name.toLowerCase()).to.equal(ProductData.firstProductData.name.toLocaleLowerCase()),
       expect(result.price).to.equal(ProductData.firstProductData.price),

diff --git a/tests/UI/pages/FO/product/index.js b/tests/UI/pages/FO/product/index.js
@@ -6,7 +6,7 @@ class Product extends FOBasePage {
     super();
 
     // Selectors for product page
-    this.productName = '#main h1[itemprop="name"]';
+    this.productName = '#main h1';
     this.productQuantity = '#quantity_wanted';
     this.productDescription = '#description';
     this.colorInput = color => `#group_2 li input[title=${color}]`;
@@ -26,7 +26,7 @@ class Product extends FOBasePage {
     this.discountAmountSpan = `${this.productPricesBlock} .discount.discount-amount`;
     this.discountPercentageSpan = `${this.productPricesBlock} .discount.discount-percentage`;
     this.regularPrice = `${this.productPricesBlock} .regular-price`;
-    this.productPrice = `${this.productPricesBlock} span[itemprop='price']`;
+    this.productPrice = `${this.productPricesBlock} .current-price span`;
     this.taxShippingDeliveryBlock = `${this.productPricesBlock} div.tax-shipping-delivery-label`;
     this.deliveryInformationSpan = `${this.taxShippingDeliveryBlock} span.delivery-information`;
     // Volume discounts table