Merge pull request #2923 from magento-obsessive-owls/cms-team-1-delivery-sprint-12

[CMS Team 1] Sprint 12 delivery, product attributes block, design data, skipped unstable test

Author: Igor Melnikov

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

@@ -67,20 +67,19 @@ public function getProduct()
     }
 
     /**
-     * $excludeAttr is optional array of attribute codes to
-     * exclude them from additional data array
+     * $excludeAttr is optional array of attribute codes to exclude them from additional data array
      *
      * @param array $excludeAttr
      * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getAdditionalData(array $excludeAttr = [])
     {
         $data = [];
         $product = $this->getProduct();
         $attributes = $product->getAttributes();
         foreach ($attributes as $attribute) {
-            if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) {
+            if ($this->isVisibleOnFrontend($attribute, $excludeAttr)) {
                 $value = $attribute->getFrontend()->getValue($product);
 
                 if ($value instanceof Phrase) {
@@ -100,4 +99,18 @@ public function getAdditionalData(array $excludeAttr = [])
         }
         return $data;
     }
+
+    /**
+     * Determine if we should display the attribute on the front-end
+     *
+     * @param \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute
+     * @param array $excludeAttr
+     * @return bool
+     */
+    protected function isVisibleOnFrontend(
+        \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute,
+        array $excludeAttr
+    ) {
+        return ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr));
+    }
 }

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductNameWithDoubleQuote.xml

@@ -15,6 +15,8 @@
             <severity value="CRITICAL"/>
             <group value="product"/>
             <testCaseId value="MAGETWO-92384"/>
+            <!-- Skipped due to MAGETWO-93261 -->
+            <group value="skip"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>

app/code/Magento/Theme/Test/Mftf/Data/DesignData.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Layout" type="page_layout">
+        <data key="1column">1 column</data>
+    </entity>
+</entities>