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

viktorpetryk · viktorpetryk · commit 06144f7b8bef · 2019-01-27T16:06:56.000+02:00
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
@@ -36,7 +36,7 @@ class AdditionalCommentTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getLabel'])
+            ->setMethods(['getComment', 'getLabel', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock = $this->getMockBuilder(Context::class)
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -37,7 +37,7 @@ class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment'])
+            ->setMethods(['getComment', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock = $this->getMockBuilder(Context::class)
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -51,7 +51,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment'])
+            ->setMethods(['getComment', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->formMock = $this->getMockBuilder(Form::class)
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -36,7 +36,7 @@ class VerticalTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)
-            ->setMethods(['getComment', 'getLabel', 'getHint'])
+            ->setMethods(['getComment', 'getLabel', 'getHint', 'getHtmlId', 'getName'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->contextMock = $this->getMockBuilder(Context::class)
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
@@ -11,6 +11,11 @@
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field\File
      */
@@ -24,6 +29,8 @@ class FileTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
 
         $this->testData = [
             'before_element_html' => 'test_before_element_html',
@@ -40,7 +47,10 @@ protected function setUp()
 
         $this->file = $objectManager->getObject(
             \Magento\Config\Block\System\Config\Form\Field\File::class,
-            ['data' => $this->testData]
+            [
+                'escaper' => $this->escaperMock,
+                'data' => $this->testData
+            ]
         );
 
         $formMock = new \Magento\Framework\DataObject();
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -13,6 +13,11 @@
 
 class ImageTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -31,10 +36,13 @@ class ImageTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
         $this->urlBuilderMock = $this->createMock(\Magento\Framework\Url::class);
         $this->image = $objectManager->getObject(
             \Magento\Config\Block\System\Config\Form\Field\Image::class,
             [
+                'escaper' => $this->escaperMock,
                 'urlBuilder' => $this->urlBuilderMock,
             ]
         );
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -7,6 +7,11 @@
 
 class AllowspecificTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific
      */
@@ -20,8 +25,11 @@ class AllowspecificTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
         $this->_object = $testHelper->getObject(
-            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class
+            \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
+            ['escaper' => $this->escaperMock]
         );
         $this->_object->setData('html_id', 'spec_element');
         $this->_formMock = $this->createPartialMock(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php b/app/code/Magento/Customer/Test/Unit/Model/Renderer/RegionTest.php
@@ -23,7 +23,7 @@ public function testRender($regionCollection)
         $escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
         $elementMock = $this->createPartialMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
-            ['getForm', 'getHtmlAttributes']
+            ['getForm', 'getHtmlAttributes', 'getHtmlId', 'getName']
         );
         $countryMock = $this->createPartialMock(
             \Magento\Framework\Data\Form\Element\AbstractElement::class,
diff --git a/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php b/app/code/Magento/OfflineShipping/Test/Unit/Block/Adminhtml/Form/Field/ImportTest.php
@@ -13,6 +13,11 @@
 
 class ImportTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import
      */
@@ -29,11 +34,16 @@ protected function setUp()
             \Magento\Framework\Data\Form::class,
             ['getFieldNameSuffix', 'addSuffixToName', 'getHtmlIdPrefix', 'getHtmlIdSuffix']
         );
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
         $testData = ['name' => 'test_name', 'html_id' => 'test_html_id'];
         $testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->_object = $testHelper->getObject(
             \Magento\OfflineShipping\Block\Adminhtml\Form\Field\Import::class,
-            ['data' => $testData]
+            [
+                'escaper' => $this->escaperMock,
+                'data' => $testData,
+            ]
         );
         $this->_object->setForm($this->_formMock);
     }
diff --git a/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php b/app/code/Magento/Paypal/Test/Unit/Block/Adminhtml/System/Config/Field/Enable/AbstractEnableTest.php
@@ -37,6 +37,7 @@ protected function setUp()
             ->setMethods(
                 [
                     'getHtmlId',
+                    'getName',
                     'getTooltip',
                     'getForm',
                 ]
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/AbstractElementTest.php
@@ -38,6 +38,7 @@ protected function setUp()
         $this->_collectionFactoryMock =
             $this->createMock(\Magento\Framework\Data\Form\Element\CollectionFactory::class);
         $this->_escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->_escaperMock->method('escapeHtml')->willReturnArgument(0);
 
         $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']);
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/LinkTest.php
@@ -26,6 +26,7 @@ protected function setUp()
         $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->method('escapeHtml')->willReturnArgument(0);
         $this->_link = new \Magento\Framework\Data\Form\Element\Link(
             $factoryMock,
             $collectionFactoryMock,
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/MultiselectTest.php
@@ -7,6 +7,11 @@
 
 class MultiselectTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $escaperMock;
+
     /**
      * @var \Magento\Framework\Data\Form\Element\Multiselect
      */
@@ -15,7 +20,12 @@ 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);
+        $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+        $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
+        $this->_model = $testHelper->getObject(
+            \Magento\Framework\Data\Form\Element\Editablemultiselect::class,
+            ['escaper' => $this->escaperMock]
+        );
         $this->_model->setForm(new \Magento\Framework\DataObject());
     }
 
diff --git a/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php b/lib/internal/Magento/Framework/Data/Test/Unit/Form/Element/NoteTest.php
@@ -26,6 +26,7 @@ protected function setUp()
         $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->method('escapeHtml')->willReturnArgument(0);
         $this->_model = new \Magento\Framework\Data\Form\Element\Note(
             $factoryMock,
             $collectionFactoryMock,

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class AdditionalCommentTest extends \PHPUnit\Framework\TestCase`
`36`	`36`	`protected function setUp()`
`37`	`37`	`{`
`38`	`38`	`$this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)`
`39`		`- ->setMethods(['getComment', 'getLabel'])`
	`39`	`+ ->setMethods(['getComment', 'getLabel', 'getHtmlId', 'getName'])`
`40`	`40`	`->disableOriginalConstructor()`
`41`	`41`	`->getMock();`
`42`	`42`	`$this->contextMock = $this->getMockBuilder(Context::class)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class CollectionTimeLabelTest extends \PHPUnit\Framework\TestCase`
`37`	`37`	`protected function setUp()`
`38`	`38`	`{`
`39`	`39`	`$this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)`
`40`		`- ->setMethods(['getComment'])`
	`40`	`+ ->setMethods(['getComment', 'getHtmlId', 'getName'])`
`41`	`41`	`->disableOriginalConstructor()`
`42`	`42`	`->getMock();`
`43`	`43`	`$this->contextMock = $this->getMockBuilder(Context::class)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class VerticalTest extends \PHPUnit\Framework\TestCase`
`36`	`36`	`protected function setUp()`
`37`	`37`	`{`
`38`	`38`	`$this->abstractElementMock = $this->getMockBuilder(AbstractElement::class)`
`39`		`- ->setMethods(['getComment', 'getLabel', 'getHint'])`
	`39`	`+ ->setMethods(['getComment', 'getLabel', 'getHint', 'getHtmlId', 'getName'])`
`40`	`40`	`->disableOriginalConstructor()`
`41`	`41`	`->getMock();`
`42`	`42`	`$this->contextMock = $this->getMockBuilder(Context::class)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,11 @@`
`13`	`13`
`14`	`14`	`class ImageTest extends \PHPUnit\Framework\TestCase`
`15`	`15`	`{`
	`16`	`+ /**`
	`17`	`+ * @var \Magento\Framework\Escaper\|\PHPUnit_Framework_MockObject_MockObject`
	`18`	`+ */`
	`19`	`+ private $escaperMock;`
	`20`	`+`
`16`	`21`	`/**`
`17`	`22`	`* @var \Magento\Framework\Url\|\PHPUnit_Framework_MockObject_MockObject`
`18`	`23`	`*/`
`@@ -31,10 +36,13 @@ class ImageTest extends \PHPUnit\Framework\TestCase`
`31`	`36`	`protected function setUp()`
`32`	`37`	`{`
`33`	`38`	`$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);`
	`39`	`+ $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);`
	`40`	`+ $this->escaperMock->method('escapeHtml')->willReturnArgument(0);`
`34`	`41`	`$this->urlBuilderMock = $this->createMock(\Magento\Framework\Url::class);`
`35`	`42`	`$this->image = $objectManager->getObject(`
`36`	`43`	`\Magento\Config\Block\System\Config\Form\Field\Image::class,`
`37`	`44`	`[`
	`45`	`+ 'escaper' => $this->escaperMock,`
`38`	`46`	`'urlBuilder' => $this->urlBuilderMock,`
`39`	`47`	`]`
`40`	`48`	`);`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ protected function setUp()`
`37`	`37`	`->setMethods(`
`38`	`38`	`[`
`39`	`39`	`'getHtmlId',`
	`40`	`+ 'getName',`
`40`	`41`	`'getTooltip',`
`41`	`42`	`'getForm',`
`42`	`43`	`]`