Merge remote-tracking branch 'origin/MAGETWO-58078' into BUGS

Aleksandr Osadchyi · Aleksandr Osadchyi · commit 15ca98f96a1f · 2016-12-22T16:35:56.000+02:00
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php
@@ -102,7 +102,7 @@ private function getElementByClass($class)
     {
         $element = null;
         foreach (array_keys($this->classReferences) as $key) {
-            if (strpos($class, $key) !== false) {
+            if ($class == $key) {
                 return $this->classReferences[$class];
             }
         }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml
@@ -167,7 +167,7 @@
                     <item name="selector" xsi:type="string">[name="product[%code%]"]</item>
                     <item name="type" xsi:type="string">null</item>
                 </item>
-                <item name="hasDatepicker" xsi:type="array">
+                <item name="admin__control-text _has-datepicker" xsi:type="array">
                     <item name="selector" xsi:type="string">[name="product[%code%]"]</item>
                     <item name="type" xsi:type="string">datepicker</item>
                 </item>

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private function getElementByClass($class)`
`102`	`102`	`{`
`103`	`103`	`$element = null;`
`104`	`104`	`foreach (array_keys($this->classReferences) as $key) {`
`105`		`- if (strpos($class, $key) !== false) {`
	`105`	`+ if ($class == $key) {`
`106`	`106`	`return $this->classReferences[$class];`
`107`	`107`	`}`
`108`	`108`	`}`