MAGETWO-71832: Prevent unset Boolean product attributes from displaying in product page #10619

Author: Volodymyr Kublytskyi

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

@@ -83,12 +83,8 @@ public function getAdditionalData(array $excludeAttr = [])
             if ($attribute->getIsVisibleOnFront() && !in_array($attribute->getAttributeCode(), $excludeAttr)) {
                 $value = $attribute->getFrontend()->getValue($product);
 
-                if (!$product->hasData($attribute->getAttributeCode())) {
-                    $value = __('N/A');
-                } elseif ($value instanceof Phrase) {
+                if ($value instanceof Phrase) {
                     $value = (string)$value;
-                } elseif ((string)$value == '') {
-                    $value = __('No');
                 } elseif ($attribute->getFrontendInput() == 'price' && is_string($value)) {
                     $value = $this->priceCurrency->convertAndFormat($value);
                 }

app/code/Magento/Catalog/Test/Unit/Block/Product/View/AttributesTest.php

@@ -3,10 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Test\Unit\Block\Product\View;
 
 use \PHPUnit\Framework\TestCase;
-use \Magento\Framework\Phrase;
 use \Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
 use \Magento\Catalog\Model\Product;
@@ -64,73 +64,58 @@ class AttributesTest extends TestCase
 
     protected function setUp()
     {
-        $this->phrase = new Phrase(__(''));
-
         $this->attribute = $this
             ->getMockBuilder(AbstractAttribute::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->attribute
             ->expects($this->any())
             ->method('getIsVisibleOnFront')
             ->willReturn(true);
-
         $this->attribute
             ->expects($this->any())
             ->method('getAttributeCode')
             ->willReturn('phrase');
-
         $this->frontendAttribute = $this
             ->getMockBuilder(AbstractFrontend::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->attribute
             ->expects($this->any())
             ->method('getFrontendInput')
             ->willReturn('phrase');
-
         $this->attribute
             ->expects($this->any())
             ->method('getFrontend')
             ->willReturn($this->frontendAttribute);
-
         $this->product = $this
             ->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->product
             ->expects($this->any())
             ->method('getAttributes')
             ->willReturn([$this->attribute]);
-
         $this->product
             ->expects($this->any())
             ->method('hasData')
             ->willReturn(true);
-
         $this->context = $this
             ->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->registry = $this
             ->getMockBuilder(Registry::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->registry
             ->expects($this->any())
             ->method('registry')
             ->willReturn($this->product);
-
         $this->priceCurrencyInterface = $this
             ->getMockBuilder(PriceCurrencyInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->attributesBlock = new AttributesBlock(
             $this->context,
             $this->registry,
@@ -141,34 +126,28 @@ protected function setUp()
     /**
      * @return void
      */
-    public function testGetAttributesBooleanNoValue()
+    public function testGetAttributeNoValue()
     {
-        $this->phrase = new Phrase(__(''));
-
+        $this->phrase = '';
         $this->frontendAttribute
             ->expects($this->any())
             ->method('getValue')
             ->willReturn($this->phrase);
-
         $attributes = $this->attributesBlock->getAdditionalData();
-
         $this->assertTrue(empty($attributes['phrase']));
     }
 
     /**
      * @return void
      */
-    public function testGetAttributesBooleanHasValue()
+    public function testGetAttributeHasValue()
     {
-        $this->phrase = new Phrase(__('Yes'));
-
+        $this->phrase = __('Yes');
         $this->frontendAttribute
             ->expects($this->any())
             ->method('getValue')
             ->willReturn($this->phrase);
-
         $attributes = $this->attributesBlock->getAdditionalData();
-
         $this->assertNotTrue(empty($attributes['phrase']));
         $this->assertNotTrue(empty($attributes['phrase']['value']));
         $this->assertEquals('Yes', $attributes['phrase']['value']);