MAGETWO-96757: Fixed incorrect displaying of the sales rule conditions

Author: roman

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php

@@ -33,11 +33,12 @@ class AbstractElementTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_factoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $this->_collectionFactoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $this->_escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->_escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
 
         $this->_model = $this->getMockForAbstractClass(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
@@ -423,9 +424,6 @@ public function testGetHtmlContainerIdWithFieldContainerIdPrefix()
      */
     public function testAddElementValues(array $initialData, $expectedValue)
     {
-        $this->_escaperMock->expects($this->any())
-            ->method('escapeHtml')
-            ->will($this->returnArgument(0));
         $this->_model->setValues($initialData['initial_values']);
         $this->_model->addElementValues($initialData['add_values'], $initialData['overwrite']);
 

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php

@@ -23,9 +23,10 @@ class LinkTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
         $this->_link = new \Magento\Framework\Data\Form\Element\Link(
             $factoryMock,
             $collectionFactoryMock,

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\Data\Test\Unit\Form\Element;
 
+use Magento\Framework\Escaper;
+
 class MultiselectTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -15,7 +17,13 @@ class MultiselectTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_model = $testHelper->getObject(\Magento\Framework\Data\Form\Element\Editablemultiselect::class);
+        $escaper = new Escaper();
+        $this->_model = $testHelper->getObject(
+            \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
+            [
+                '_escaper' => $escaper
+            ]
+        );
         $this->_model->setForm(new \Magento\Framework\DataObject());
     }
 

lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php

@@ -23,9 +23,10 @@ class NoteTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $factoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\Factory::class);
         $collectionFactoryMock = $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
-        $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $escaperMock = $objectManager->getObject(\Magento\Framework\Escaper::class);
         $this->_model = new \Magento\Framework\Data\Form\Element\Note(
             $factoryMock,
             $collectionFactoryMock,