MAGETWO-32367: Move Core\Helper\PostData.php to framework

Remove getEncodedUrl
Move and update old unit test for PostData

Author: otoolec

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

@@ -45,6 +45,11 @@ class ListProduct extends AbstractProduct implements IdentityInterface
      */
     protected $_postDataHelper;
 
+    /**
+     * @var \Magento\Framework\Url\Helper
+     */
+    protected $urlHelper;
+
     /**
      * @var CategoryRepositoryInterface
      */
@@ -62,11 +67,13 @@ public function __construct(
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository,
+        \Magento\Framework\Url\Helper $urlHelper,
         array $data = []
     ) {
         $this->_catalogLayer = $layerResolver->get();
         $this->_postDataHelper = $postDataHelper;
         $this->categoryRepository = $categoryRepository;
+        $this->urlHelper = $urlHelper;
         parent::__construct(
             $context,
             $data
@@ -334,7 +341,7 @@ public function getAddToCartPostParams(\Magento\Catalog\Model\Product $product)
             'data' => [
                 'product' => $product->getEntityId(),
                 \Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED =>
-                    $this->_postDataHelper->getEncodedUrl($url),
+                    $this->urlHelper->getEncodedUrl($url),
             ]
         ];
     }

app/code/Magento/Msrp/view/base/templates/product/price/msrp.phtml

@@ -38,7 +38,7 @@ if ($product->isSaleable()) {
         $product,
         ['_query' => [
             \Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED =>
-                $this->helper('Magento\Framework\Data\Helper\PostHelper')->getEncodedUrl(
+                $this->helper('Magento\Framework\Url\Helper')->getEncodedUrl(
                     $addToCartUrlGenerator->getAddToCartUrl($product)
                 ),
         ]]

dev/tests/unit/testsuite/Magento/Core/Helper/PostDataTest.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\Data\Helper;
+
+use Magento\Framework\App\Action\Action;
+
+class PostHelperTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetPostData()
+    {
+        $url = '/controller/sample/action/url/';
+        $product = ['product' => new \Magento\Framework\Object(['id' => 1])];
+        $expected = json_encode([
+            'action' => $url,
+            'data' => [
+                'product' => new \Magento\Framework\Object(['id' => 1]),
+                Action::PARAM_NAME_URL_ENCODED => strtr(base64_encode($url . 'for_uenc'), '+/=', '-_,'),
+            ],
+        ]);
+
+        $contextMock = $this->getMock(
+            'Magento\Framework\App\Helper\Context',
+            ['getUrlBuilder', 'getUrlEncoder'],
+            [],
+            '',
+            false
+        );
+        $urlHelper = $this->getMockBuilder('Magento\Framework\Url\Helper')
+            ->disableOriginalConstructor()->getMock();
+        $urlHelper->expects($this->once())
+            ->method('getEncodedUrl')
+            ->willReturn('L2NvbnRyb2xsZXIvc2FtcGxlL2FjdGlvbi91cmwvZm9yX3VlbmM,');
+
+        $model = new \Magento\Framework\Data\Helper\PostHelper($contextMock, $urlHelper);
+
+        $actual = $model->getPostData($url, $product);
+        $this->assertEquals($expected, $actual);
+    }
+}

dev/tests/unit/testsuite/Magento/Framework/Data/Helper/PostHelperTest.php

@@ -9,8 +9,22 @@
  */
 namespace Magento\Framework\Data\Helper;
 
+use Magento\Framework\App\Helper\Context;
+
 class PostHelper extends \Magento\Framework\App\Helper\AbstractHelper
 {
+    /**
+     * @var \Magento\Framework\Url\Helper
+     */
+    private $urlHelper;
+
+    public function __construct(
+        Context $context,
+        \Magento\Framework\Url\Helper $urlHelper
+    ) {
+        $this->urlHelper = $urlHelper;
+    }
+
     /**
      * get data for post by javascript in format acceptable to $.mage.dataPost widget
      *
@@ -21,22 +35,8 @@ class PostHelper extends \Magento\Framework\App\Helper\AbstractHelper
     public function getPostData($url, array $data = [])
     {
         if (!isset($data[\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED])) {
-            $data[\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED] = $this->getEncodedUrl();
+            $data[\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED] = $this->urlHelper->getEncodedUrl();
         }
         return json_encode(['action' => $url, 'data' => $data]);
     }
-
-    /**
-     * Get current encoded url
-     *
-     * @param string|null $url
-     * @return string
-     */
-    public function getEncodedUrl($url = null)
-    {
-        if (!$url) {
-            $url = $this->_urlBuilder->getCurrentUrl();
-        }
-        return $this->urlEncoder->encode($url);
-    }
 }