Merge remote-tracking branch 'origin/MAGETWO-95371' into 2.1.18-develop-pr68

Author: zakdma

app/code/Magento/Tax/Model/System/Message/Notifications.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Tax\Model\System\Message;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Notifications class
  */
@@ -57,22 +59,30 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
      */
     private $notifications = [];
 
+    /**
+     * @var \Magento\Framework\Escaper
+     */
+    private $escaper;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param NotificationInterface[] $notifications
+     * @param \Magento\Framework\Escaper|null $escaper
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Tax\Model\Config $taxConfig,
-        $notifications = []
+        $notifications = [],
+        \Magento\Framework\Escaper $escaper = null
     ) {
         $this->storeManager = $storeManager;
         $this->urlBuilder = $urlBuilder;
         $this->taxConfig = $taxConfig;
         $this->notifications = $notifications;
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
     }
 
     /**
@@ -134,13 +144,13 @@ public function getSeverity()
     }
 
     /**
-     * Get URL for the tax notification documentation.
+     * Get URL for the tax notification documentation
      *
      * @return string
      */
     public function getInfoUrl()
     {
-        return $this->taxConfig->getInfoUrl();
+        return $this->escaper->escapeUrl($this->taxConfig->getInfoUrl());
     }
 
     /**

app/code/Magento/Tax/Test/Unit/Model/System/Message/NotificationsTest.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Tax\Test\Unit\Model\System\Message;
 
+use Magento\Framework\Escaper;
 use Magento\Tax\Model\Config as TaxConfig;
 use Magento\Tax\Model\System\Message\Notifications;
 use Magento\Store\Model\StoreManagerInterface;
@@ -14,7 +15,7 @@
 use Magento\Tax\Model\System\Message\NotificationInterface;
 
 /**
- * Test class for @see \Magento\Tax\Model\System\Message\Notifications
+ * Test class for @see \Magento\Tax\Model\System\Message\Notifications.
  */
 class NotificationsTest extends \PHPUnit_Framework_TestCase
 {
@@ -43,21 +44,29 @@ class NotificationsTest extends \PHPUnit_Framework_TestCase
      */
     private $notificationMock;
 
+    /**
+     * @var Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        parent::setUp();
-
         $this->storeManagerMock = $this->getMock(StoreManagerInterface::class, [], [], '', false);
         $this->urlBuilderMock = $this->getMock(UrlInterface::class, [], [], '', false);
         $this->taxConfigMock = $this->getMock(TaxConfig::class, [], [], '', false);
         $this->notificationMock = $this->getMock(NotificationInterface::class, [], [], '', false);
+        $this->escaperMock = $this->getMock(Escaper::class);
         $this->notifications = (new ObjectManager($this))->getObject(
             Notifications::class,
             [
                 'storeManager' => $this->storeManagerMock,
                 'urlBuilder' => $this->urlBuilderMock,
                 'taxConfig' => $this->taxConfigMock,
-                'notifications' => [$this->notificationMock]
+                'notifications' => [$this->notificationMock],
+                'escaper' => $this->escaperMock,
             ]
         );
     }
@@ -84,17 +93,44 @@ public function dataProviderIsDisplayed()
         ];
     }
 
+    /**
+     * Unit test for getText method.
+     *
+     * @return void
+     */
     public function testGetText()
     {
+        $url = 'http://info-url';
         $this->notificationMock->expects($this->once())->method('getText')->willReturn('Notification Text.');
-        $this->taxConfigMock->expects($this->once())->method('getInfoUrl')->willReturn('http://info-url');
+        $this->taxConfigMock->expects($this->once())->method('getInfoUrl')->willReturn($url);
         $this->urlBuilderMock->expects($this->once())->method('getUrl')
             ->with('adminhtml/system_config/edit/section/tax')->willReturn('http://tax-config-url');
+        $this->escaperMock->expects($this->once())
+            ->method('escapeUrl')
+            ->with($url)
+            ->willReturn($url);
 
         $this->assertEquals(
             'Notification Text.<p>Please see <a href="http://info-url">documentation</a> for more details. '
             . 'Click here to go to <a href="http://tax-config-url">Tax Configuration</a> and change your settings.</p>',
             $this->notifications->getText()
         );
     }
+
+    /**
+     * Unit test for getInfoUrl method.
+     *
+     * @return void
+     */
+    public function testGetInfoUrl()
+    {
+        $url = 'http://info-url';
+        $this->taxConfigMock->expects($this->once())->method('getInfoUrl')->willReturn($url);
+        $this->escaperMock->expects($this->once())
+            ->method('escapeUrl')
+            ->with($url)
+            ->willReturn($url);
+
+        $this->assertEquals($url, $this->notifications->getInfoUrl());
+    }
 }