MAGETWO-64081: Merge branch 'MAGETWO-64081' of github.com:magento-engcom/magento2ce into develop-prs

Author: ishakhsuvarov

app/code/Magento/Config/Block/System/Config/Form/Field/FieldArray/AbstractFieldArray.php

@@ -279,4 +279,12 @@ public function getColumns()
     {
         return $this->_columns;
     }
+
+    /**
+     * @return string
+     */
+    public function getAddButtonLabel()
+    {
+        return $this->_addButtonLabel;
+    }
 }

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FieldArray/AbstractTest.php

@@ -7,10 +7,14 @@
 
 class AbstractTest extends \PHPUnit_Framework_TestCase
 {
-    public function testGetArrayRows()
+    /**
+     * @var \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
+     */
+    private $model;
+
+    protected function setUp()
     {
-        /** @var $block \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray */
-        $block = $this->getMockForAbstractClass(
+        $this->model = $this->getMockForAbstractClass(
             \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray::class,
             [],
             '',
@@ -19,12 +23,15 @@ public function testGetArrayRows()
             true,
             ['escapeHtml']
         );
-        $block->expects($this->any())->method('escapeHtml')->will($this->returnArgument(0));
+    }
 
+    public function testGetArrayRows()
+    {
+        $this->model->expects($this->any())->method('escapeHtml')->will($this->returnArgument(0));
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $element = $objectManager->getObject(\Magento\Framework\Data\Form\Element\Multiselect::class);
         $element->setValue([['te<s>t' => 't<e>st', 'data&1' => 'da&ta1']]);
-        $block->setElement($element);
+        $this->model->setElement($element);
         $this->assertEquals(
             [
                 new \Magento\Framework\DataObject(
@@ -36,7 +43,17 @@ public function testGetArrayRows()
                     ]
                 ),
             ],
-            $block->getArrayRows()
+            $this->model->getArrayRows()
         );
     }
+
+    public function testGetAddButtonLabel()
+    {
+        $contextMock = $this->getMockBuilder(\Magento\Backend\Block\Template\Context::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model->__construct($contextMock);
+
+        $this->assertEquals("Add", $this->model->getAddButtonLabel());
+    }
 }

app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml

@@ -28,7 +28,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
             <tr>
                 <td colspan="<?php echo count($block->getColumns())+$_colspan; ?>" class="col-actions-add">
                     <button id="addToEndBtn<?php /* @escapeNotVerified */ echo $_htmlId; ?>" class="action-add" title="<?php /* @escapeNotVerified */ echo __('Add'); ?>" type="button">
-                        <span><?php /* @escapeNotVerified */ echo $block->getAddButtonLabel(); ?><?php /* @escapeNotVerified */ echo __('Add'); ?></span>
+                        <span><?php /* @escapeNotVerified */ echo $block->getAddButtonLabel(); ?></span>
                     </button>
                 </td>
             </tr>