MAGETWO-69474: [FT] CreateProductAttributeEntityFromProductPageTest (CreateProductAttributeEntityFromProductPageTestVariation1_Searchable_Global_Visible_Comparable_HtmlAllowed_UsedForSorting) unstable for 2.1.7 (CE)

Author: ameysar

app/code/Magento/Catalog/Block/Product/View/Attributes.php

@@ -12,8 +12,12 @@
 namespace Magento\Catalog\Block\Product\View;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\Phrase;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 
+/**
+ * Product attributes block.
+ */
 class Attributes extends \Magento\Framework\View\Element\Template
 {
     /**
@@ -58,6 +62,7 @@ public function getProduct()
         if (!$this->_product) {
             $this->_product = $this->_coreRegistry->registry('product');
         }
+
         return $this->_product;
     }
 
@@ -86,7 +91,7 @@ public function getAdditionalData(array $excludeAttr = [])
                     $value = $this->priceCurrency->convertAndFormat($value);
                 }
 
-                if (is_string($value) && strlen($value)) {
+                if (($value instanceof Phrase || is_string($value)) && strlen($value)) {
                     $data[$attribute->getAttributeCode()] = [
                         'label' => __($attribute->getStoreLabel()),
                         'value' => $value,
@@ -95,6 +100,7 @@ public function getAdditionalData(array $excludeAttr = [])
                 }
             }
         }
+
         return $data;
     }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.php

@@ -109,6 +109,8 @@ public function openSection($sectionName)
         $sectionElement = $this->getContainerElement($sectionName);
         if ($sectionElement->getAttribute('type') == 'button') {
             $sectionElement->click();
+            // Wait until section animation finished.
+            $this->waitForElementVisible($this->closeButton);
         } else {
             parent::openSection($sectionName);
         }

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/ListProduct.php

@@ -16,13 +16,17 @@
  */
 class ListProduct extends Block
 {
+    // @codingStandardsIgnoreStart
+
     /**
      * Locator for product item block.
      *
      * @var string
      */
     protected $productItem = './/*[contains(@class,"product-item-link") and normalize-space(text())="%s"]/ancestor::li';
 
+    // @codingStandardsIgnoreEnd
+
     /**
      * Locator for product item link.
      *
@@ -48,7 +52,7 @@ public function getProductItem(FixtureInterface $product)
         $locator = sprintf($this->productItem, $product->getName());
 
         return $this->blockFactory->create(
-            'Magento\Catalog\Test\Block\Product\ProductList\ProductItem',
+            \Magento\Catalog\Test\Block\Product\ProductList\ProductItem::class,
             ['element' => $this->_rootElement->find($locator, Locator::SELECTOR_XPATH)]
         );
     }
@@ -77,6 +81,8 @@ public function getProductNames()
      */
     public function getSortByValues()
     {
-        return explode("\n", $this->_rootElement->find($this->sorter)->getText());
+        $sortValues = $this->_rootElement->find($this->sorter)->getText();
+        
+        return array_filter(array_map("trim", explode("\n", $sortValues)));
     }
 }