Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-94346

Author: le0n4eg

app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationIndustryTest.xml

@@ -17,9 +17,6 @@
             <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-63898"/>
             <group value="analytics"/>
-            <skip>
-                <issueId value="MAGETWO-96223"/>
-            </skip>
         </annotations>
 
         <actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Authorizenet/view/adminhtml/templates/order/view/info/fraud_details.phtml

@@ -44,8 +44,8 @@ $fraudDetails = $payment->getAdditionalInformation('fraud_details');
             <?php endif; ?>
 
             <?php if(!empty($fraudDetails['fraud_filters'])): ?>
-                <b><?= $block->escapeHtml(__('Fraud Filters')) ?>:
-                </b></br>
+                <strong><?= $block->escapeHtml(__('Fraud Filters')) ?>:
+                </strong></br>
                 <?php foreach($fraudDetails['fraud_filters'] as $filter): ?>
                     <?= $block->escapeHtml($filter['name']) ?>:
                     <?= $block->escapeHtml($filter['action']) ?>

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -125,6 +125,7 @@ public function __construct(\Magento\Catalog\Block\Product\Context $context, arr
 
     /**
      * Retrieve url for add product to cart
+     *
      * Will return product view page URL if product has required options
      *
      * @param \Magento\Catalog\Model\Product $product
@@ -473,7 +474,9 @@ public function getProductDetailsHtml(\Magento\Catalog\Model\Product $product)
     }
 
     /**
-     * @param null $type
+     * Get the renderer that will be used to render the details block
+     *
+     * @param string|null $type
      * @return bool|\Magento\Framework\View\Element\AbstractBlock
      */
     public function getDetailsRenderer($type = null)
@@ -489,6 +492,8 @@ public function getDetailsRenderer($type = null)
     }
 
     /**
+     * Return the list of details
+     *
      * @return \Magento\Framework\View\Element\RendererList
      */
     protected function getDetailsRendererList()

app/code/Magento/Catalog/Helper/Product/Compare.php

@@ -166,7 +166,15 @@ public function getListUrl()
      */
     public function getPostDataParams($product)
     {
-        return $this->postHelper->getPostData($this->getAddUrl(), ['product' => $product->getId()]);
+        $params = ['product' => $product->getId()];
+        $requestingPageUrl = $this->_getRequest()->getParam('requesting_page_url');
+
+        if (!empty($requestingPageUrl)) {
+            $encodedUrl = $this->urlEncoder->encode($requestingPageUrl);
+            $params[\Magento\Framework\App\ActionInterface::PARAM_NAME_URL_ENCODED] = $encodedUrl;
+        }
+
+        return $this->postHelper->getPostData($this->getAddUrl(), $params);
     }
 
     /**

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml

@@ -28,7 +28,8 @@
         <element name="productPriceLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
         <element name="ProductAddToCartByName" type="button" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocart')]" parameterized="true"/>
-        <element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
+        <!--<element name="ProductAddToCompareByName" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>-->
+        <element name="ProductAddToCompareByName" type="text" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{var1}}')]]//a[contains(@class, 'tocompare')]" parameterized="true"/>
         <element name="ProductImageByNameAndSrc" type="text" selector="//main//li[.//a[contains(text(), '{{var1}}')]]//img[contains(@src, '{{src}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Test/AdminAddImageToWYSIWYGProductTest.xml

@@ -16,9 +16,6 @@
             <description value="Admin should be able to add image to WYSIWYG Editor on Product Page"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-84375"/>
-            <skip>
-                <issueId value="MAGETWO-94438"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="login"/>

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

@@ -82,7 +82,7 @@ define([
     return function (config, element) {
         config = config || {};
         jQuery(element).on('click', function () {
-            categorySubmit(config.url, config.ajax);
+            categorySubmit();
         });
     };
 });

app/code/Magento/CatalogRule/Test/Mftf/Test/CatalogPriceRuleAndCustomerGroupMembershipArePersistedUnderLongTermCookieTest.xml

@@ -17,9 +17,6 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-69455"/>
             <group value="persistent"/>
-            <skip>
-                <issueId value="MAGETWO-96656"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="PersistentConfigEnabled" stepKey="enablePersistent"/>

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -11,11 +11,13 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Widget\Block\BlockInterface;
+use Magento\Framework\Url\EncoderInterface;
 
 /**
  * Catalog Products List widget block
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
  */
 class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
 {
@@ -94,6 +96,11 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      */
     private $json;
 
+    /**
+     * @var \Magento\Framework\Url\EncoderInterface|null
+     */
+    private $urlEncoder;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -104,6 +111,7 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      * @param \Magento\Widget\Helper\Conditions $conditionsHelper
      * @param array $data
      * @param Json|null $json
+     * @param \Magento\Framework\Url\EncoderInterface|null $urlEncoder
      */
     public function __construct(
         \Magento\Catalog\Block\Product\Context $context,
@@ -114,7 +122,8 @@ public function __construct(
         \Magento\CatalogWidget\Model\Rule $rule,
         \Magento\Widget\Helper\Conditions $conditionsHelper,
         array $data = [],
-        Json $json = null
+        Json $json = null,
+        EncoderInterface $urlEncoder = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
@@ -123,6 +132,7 @@ public function __construct(
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->json = $json ?: ObjectManager::getInstance()->get(Json::class);
+        $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()->get(EncoderInterface::class);
         parent::__construct(
             $context,
             $data
@@ -153,6 +163,7 @@ protected function _construct()
      * Get key pieces for caching block content
      *
      * @return array
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function getCacheKeyInfo()
     {
@@ -230,6 +241,7 @@ protected function _beforeToHtml()
      * Prepare and return product collection
      *
      * @return \Magento\Catalog\Model\ResourceModel\Product\Collection
+     * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
      */
     public function createCollection()
     {
@@ -409,6 +421,22 @@ private function getPriceCurrency()
         return $this->priceCurrency;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getAddToCartUrl($product, $additional = [])
+    {
+        $requestingPageUrl = $this->getRequest()->getParam('requesting_page_url');
+
+        if (!empty($requestingPageUrl)) {
+            $additional['useUencPlaceholder'] = true;
+            $url = parent::getAddToCartUrl($product, $additional);
+            return str_replace('%25uenc%25', $this->urlEncoder->encode($requestingPageUrl), $url);
+        }
+
+        return parent::getAddToCartUrl($product, $additional);
+    }
+
     /**
      * Get widget block name
      *

app/code/Magento/CatalogWidget/Test/Mftf/Section/ProductListWidgetSection.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="ProductListWidgetSection">
+        <element name="AddToCartByName" type="button" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{arg1}}')]]//button[contains(@class,'tocart')]" parameterized="true"/>
+        <element name="AddToCompareByName" type="button" selector="//*[contains(@class,'product-item-info')][descendant::a[contains(text(), '{{arg1}}')]]//button[contains(@class,'tocompare')]" parameterized="true"/>
+    </section>
+</sections>