MAGETWO-44055: [GITHUB] Admin product «Custom Options» tab controls («Import Options», «Add New Option» buttons) do not work when non-English locale is used #1971

- fix tests

Author: Michail Slabko

app/code/Magento/Catalog/Model/CategoryLinkManagement.php

@@ -45,7 +45,7 @@ public function getAssignedProducts($categoryId)
         $links = [];
 
         /** @var \Magento\Catalog\Model\Product $product */
-        foreach ($products->getItems() as $productId => $product) {
+        foreach ($products->getItems() as $product) {
             /** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface $link */
             $link = $this->productLinkFactory->create();
             $link->setSku($product->getSku())

app/code/Magento/Catalog/Test/Unit/Model/Config/Source/Product/Options/TypeTest.php

@@ -51,7 +51,7 @@ public function testToOptionArray()
         ];
         $expect = [
             ['value' => '', 'label' => __('-- Please select --')],
-            ['label' => 'optionLabel', 'value' => [['label' => 'typeLabel', 'value' => 'typeName']]],
+            ['label' => 'optionLabel', 'optgroup-name' => 'optionLabel', 'value' => [['label' => 'typeLabel', 'value' => 'typeName']]],
         ];
 
         $this->productOptionConfig->expects($this->any())->method('getAll')->will($this->returnValue($allOptions));

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit.phtml

@@ -21,7 +21,7 @@
                 </button>
                 <ul class="dropdown-menu">
                     <li><input type="text" id="product-template-suggest" class="search"
-                           placeholder="<?php echo __('start typing to search template'); ?>"/></li>
+                           placeholder="<?php /* @noEscape */ echo __('start typing to search template'); ?>"/></li>
                 </ul>
             </div>
         </div>

app/code/Magento/Catalog/view/adminhtml/templates/product/edit/attribute/search.phtml

@@ -17,7 +17,7 @@
             <input data-role="product-attribute-search"
                    data-group="<?php echo $block->escapeHtml($block->getGroupCode()); ?>"
                    class="search" type="text"
-                   placeholder="<?php echo __('start typing to search attribute'); ?>" />
+                   placeholder="<?php /* @noEscape */ echo __('start typing to search attribute'); ?>" />
         </div>
     </div>
 

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFileTest.php

@@ -16,7 +16,7 @@ class ValidatorFileTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\ObjectManager
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;
 

lib/internal/Magento/Framework/View/Element/Html/Select.php

@@ -125,6 +125,7 @@ public function getTitle()
      * @return string
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _toHtml()
     {

lib/internal/Magento/Framework/View/Test/Unit/Element/Html/SelectTest.php

@@ -127,7 +127,7 @@ public function testGetHtml()
             .   '<option value="testValue"  paramKey="paramValue" >testLabel</option>'
             .   '<option value="selectedValue" selected="selected"  paramKey="paramValue" '
             .       ' paramKey2="paramValue2" >selectedLabel</option>'
-            .   '<optgroup label="groupLabel">'
+            .   '<optgroup label="groupLabel" data-optgroup-name="groupLabel">'
             .       '<option value="groupElementValue" >GroupElementLabel</option>'
             .       '<option value="selectedGroupElementValue" selected="selected" >SelectedGroupElementLabel</option>'
             .   '</optgroup>'