From 5fb36956c22eb2d1090f9cfd84c21314bd1febfb Mon Sep 17 00:00:00 2001
From: Volodymyr Sevostianov <vsevostianov@magento.com>
Date: Tue, 20 Dec 2016 12:26:24 +0200
Subject: [PATCH] MAGETWO-58078: [FT]
CreateProductAttributeEntityFromProductPageTest fails
---
.../Test/Block/Adminhtml/Product/Attribute/CustomAttribute.php | 2 +-
dev/tests/functional/tests/app/Magento/Catalog/Test/etc/di.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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
index 53fe49b759c..3c324de0cab 100644
--- 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 @@ class CustomAttribute extends SimpleElement
{
$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
index 82a7c263b1c..fee6efedff2 100644
--- 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>
--
GitLab