Escape html removed from error message

Author: subash-natarajan

app/code/Magento/Customer/Controller/Adminhtml/Group/Save.php

@@ -20,11 +20,6 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Group implements HttpP
      */
     protected $dataObjectProcessor;
 
-    /**
-     * @var \Magento\Framework\Escaper
-     */
-    protected $escaper;
-
     /**
      *
      * @param \Magento\Backend\App\Action\Context $context
@@ -34,7 +29,6 @@ class Save extends \Magento\Customer\Controller\Adminhtml\Group implements HttpP
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
-     * @param \Magento\Framework\Escaper $escaper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
@@ -43,11 +37,9 @@ public function __construct(
         GroupInterfaceFactory $groupDataFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor,
-        \Magento\Framework\Escaper $escaper
+        \Magento\Framework\Reflection\DataObjectProcessor $dataObjectProcessor
     ) {
         $this->dataObjectProcessor = $dataObjectProcessor;
-        $this->escaper = $escaper;
         parent::__construct(
             $context,
             $coreRegistry,
@@ -104,7 +96,7 @@ public function execute()
                 $this->messageManager->addSuccessMessage(__('You saved the customer group.'));
                 $resultRedirect->setPath('customer/group');
             } catch (\Exception $e) {
-                $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
+                $this->messageManager->addErrorMessage($e->getMessage());
                 if ($customerGroup != null) {
                     $this->storeCustomerGroupDataToSession(
                         $this->dataObjectProcessor->buildOutputDataArray(

app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Group/SaveTest.php

@@ -87,10 +87,6 @@ protected function setUp()
         $this->dataObjectProcessorMock = $this->getMockBuilder(DataObjectProcessor::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->escaper = $this->getMockBuilder(\Magento\Framework\Escaper::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['escapeHtml'])
-            ->getMock();
         $this->request = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
             ->getMockForAbstractClass();
         $this->resultRedirectFactory = $this->getMockBuilder(RedirectFactory::class)
@@ -133,8 +129,7 @@ protected function setUp()
             $this->groupInterfaceFactoryMock,
             $this->forwardFactoryMock,
             $this->pageFactoryMock,
-            $this->dataObjectProcessorMock,
-            $this->escaper
+            $this->dataObjectProcessorMock
         );
     }
 

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/GroupTest.php

@@ -199,7 +199,7 @@ public function testSaveActionCreateNewGroupWithoutCode()
         $this->dispatch('backend/customer/group/save');
 
         $this->assertSessionMessages(
-            $this->equalTo(['"code" is required. Enter and try again.']),
+            $this->equalTo([htmlspecialchars('"code" is required. Enter and try again.')]),
             MessageInterface::TYPE_ERROR
         );
     }
@@ -292,7 +292,7 @@ public function testSaveActionNewGroupWithoutGroupCode()
         $this->dispatch('backend/customer/group/save');
 
         $this->assertSessionMessages(
-            $this->equalTo(['"code" is required. Enter and try again.']),
+            $this->equalTo([htmlspecialchars('"code" is required. Enter and try again.')]),
             MessageInterface::TYPE_ERROR
         );
         $this->assertSessionMessages($this->isEmpty(), MessageInterface::TYPE_SUCCESS);