Merge branch 'MAGETWO-51754' of https://github.corp.magento.com/magento-tango/magento2ce into MAGETWO-52212

Author: shiftedreality

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductAttributeIsRequired.php

@@ -29,23 +29,27 @@ class AssertProductAttributeIsRequired extends AbstractConstraint
      * @param CatalogProductEdit $catalogProductEdit
      * @param CatalogProductAttribute $attribute
      * @param InjectableFixture $product
+     * @param string $sectionName
      * @return void
      */
     public function processAssert(
         CatalogProductIndex $catalogProductIndex,
         CatalogProductEdit $catalogProductEdit,
         CatalogProductAttribute $attribute,
-        InjectableFixture $product
+        InjectableFixture $product,
+        $sectionName
     ) {
         $catalogProductIndex->open()->getProductGrid()->searchAndOpen(['sku' => $product->getSku()]);
         $productForm = $catalogProductEdit->getProductForm();
         if (!$productForm->checkAttributeLabel($attribute)) {
-            $productForm->openSection('attributes');
+            $productForm->openSection($sectionName);
         }
         $productForm->getAttributeElement($attribute)->setValue('');
         $catalogProductEdit->getFormPageActions()->save();
-        $failedFields = $productForm->getRequireNoticeFields($product);
-        $actualMessage = $failedFields['attributes'][$attribute->getFrontendLabel()];
+        $validationErrors = $productForm->getSection($sectionName)->getValidationErrors();
+        $actualMessage = isset($validationErrors[$attribute->getFrontendLabel()])
+            ? $validationErrors[$attribute->getFrontendLabel()]
+            : '';
 
         \PHPUnit_Framework_Assert::assertEquals(
             self::REQUIRE_MESSAGE,

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.xml

@@ -55,6 +55,7 @@
             <data name="attribute/data/is_required" xsi:type="string">Yes</data>
             <data name="attribute/data/attribute_code" xsi:type="string">attr_text_%isolation%</data>
             <data name="attribute/data/default_value_text" xsi:type="string">default_value_text%isolation%</data>
+            <data name="sectionName" xsi:type="string">attributes</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeIsRequired" />
         </variation>
         <variation name="CreateProductAttributeEntityFromProductPageTestVariation4">

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml

@@ -32,6 +32,7 @@
             <data name="productAttribute/data/is_searchable" xsi:type="string">Yes</data>
             <data name="productAttribute/data/is_visible_in_advanced_search" xsi:type="string">Yes</data>
             <data name="productAttribute/data/is_comparable" xsi:type="string">Yes</data>
+            <data name="sectionName" xsi:type="string">product-details</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />
@@ -130,6 +131,7 @@
             <data name="assertProduct/data/name" xsi:type="string">Product name</data>
             <data name="assertProduct/data/sku" xsi:type="string">product-sku</data>
             <data name="assertProduct/data/price" xsi:type="string">35</data>
+            <data name="sectionName" xsi:type="string">product-details</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductAttributeInGrid" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertAddedProductAttributeOnProductForm" />