Merge remote-tracking branch 'origin/MAGETWO-72181' into chaika-pr1

Author: Sergey Shvets

lib/internal/Magento/Framework/Data/Form/Element/Multiselect.php

@@ -59,6 +59,10 @@ public function getElementHtml()
         if ($this->getCanBeEmpty()) {
             $html .= '<input type="hidden" name="' . parent::getName() . '" value="" />';
         }
+        if (!empty($this->_data['disabled'])) {
+            $html .= '<input type="hidden" name="' . parent::getName() . '_disabled" value="" />';
+        }
+
         $html .= '<select id="' . $this->getHtmlId() . '" name="' . $this->getName() . '" ' . $this->serialize(
             $this->getHtmlAttributes()
         ) . $this->_getUiId() . ' multiple="multiple">' . "\n";

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

@@ -26,10 +26,37 @@ protected function setUp()
      */
     public function testHiddenFieldPresentInMultiSelect()
     {
-        $this->_model->setDisabled(true);
+        $fieldName = 'fieldName';
         $this->_model->setCanBeEmpty(true);
+        $this->_model->setName($fieldName);
+        $elementHtml = $this->_model->getElementHtml();
+        $this->assertContains('<input type="hidden" name="' . $fieldName . '"', $elementHtml);
+    }
+
+    /**
+     * Verify that hidden input is present in multiselect and it allow indicate is multiselect is disabled.
+     */
+    public function testHiddenDisabledFieldPresentInMultiSelect()
+    {
+        $fieldName = 'fieldName';
+        $this->_model->setDisabled(true);
+        $this->_model->setName($fieldName);
+        $elementHtml = $this->_model->getElementHtml();
+        $this->assertContains('<input type="hidden" name="' . $fieldName . '_disabled"', $elementHtml);
+    }
+
+    /**
+     * Verify that hidden input doesn't present in multiselect and it allow indicate is multiselect is disabled.
+     *
+     * @covers \Magento\Framework\Data\Form\Element\Multiselect::getElementHtml
+     */
+    public function testHiddenDisabledFieldNotPresentInMultiSelect()
+    {
+        $fieldName = 'fieldName';
+        $this->_model->setDisabled(false);
+        $this->_model->setName($fieldName);
         $elementHtml = $this->_model->getElementHtml();
-        $this->assertContains('<input type="hidden"', $elementHtml);
+        $this->assertNotContains('<input type="hidden" name="' . $fieldName . '_disabled"', $elementHtml);
     }
 
     /**