MAGETWO-64175: Merge branch 'MAGETWO-64175' of github.com:magento-engcom/magento2ce into develop-prs

Author: ishakhsuvarov

app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php

@@ -284,20 +284,10 @@ protected function _assignProducts()
             $productCollection->setVisibility($this->_productVisibility->getVisibleInSiteIds());
         }
 
-        $attributesToSelect = [
-            'name',
-            'visibility',
-            'small_image',
-            'thumbnail',
-            'links_purchased_separately',
-            'links_title',
-            'price_type'
-        ];
-
         $productCollection->addPriceData()
             ->addTaxPercents()
             ->addIdFilter($this->_productIds)
-            ->addAttributeToSelect($attributesToSelect)
+            ->addAttributeToSelect($this->_wishlistConfig->getProductAttributes())
             ->addOptionsToResult()
             ->addUrlRewrite();
 

app/code/Magento/Wishlist/etc/catalog_attributes.xml

@@ -7,6 +7,12 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Catalog:etc/catalog_attributes.xsd">
     <group name="wishlist_item">
+        <attribute name="name"/>
+        <attribute name="small_image"/>
+        <attribute name="thumbnail"/>
+        <attribute name="links_purchased_separately"/>
+        <attribute name="links_title"/>
+        <attribute name="price_type"/>
         <attribute name="visibility"/>
         <attribute name="url_path"/>
         <attribute name="url_key"/>

dev/tests/integration/testsuite/Magento/Wishlist/Model/ResourceModel/Item/CollectionTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Wishlist\Model\ResourceModel\Item;
+
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\ObjectManager;
+use Magento\Wishlist\Model\Wishlist;
+use Magento\Catalog\Model\Attribute\Config;
+
+class CollectionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var Collection
+     */
+    private $itemCollection;
+
+    /**
+     * @var Wishlist
+     */
+    private $wishlist;
+
+    /**
+     * @var Config\Data
+     */
+    private $attributeConfig;
+
+    protected function setUp()
+    {
+        $this->objectManager = ObjectManager::getInstance();
+        $this->wishlist = $this->objectManager->create(Wishlist::class);
+        $this->itemCollection = $this->objectManager->get(Collection::class);
+        $this->attributeConfig = $this->objectManager->get(Config\Data::class);
+    }
+
+    /**
+     * Verify that Wishlist Item Collection uses Catalog Attributes defined in the configuration.
+     *
+     * @magentoDataFixture Magento/Wishlist/_files/wishlist_shared.php
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testLoadedProductAttributes()
+    {
+        $this->addAttributesToWishlistConfig([
+            'short_description',
+        ]);
+        $this->wishlist->loadByCode('fixture_unique_code');
+        $this->itemCollection->addWishlistFilter($this->wishlist);
+
+        /** @var Product $productOnWishlist */
+        $productOnWishlist = $this->itemCollection->getFirstItem()->getProduct();
+        $this->assertEquals('Simple Product', $productOnWishlist->getName());
+        $this->assertEquals('Short description', $productOnWishlist->getData('short_description'));
+    }
+
+    /**
+     * @param array $attributes
+     */
+    private function addAttributesToWishlistConfig($attributes)
+    {
+        $this->attributeConfig->merge([
+            'wishlist_item' => $attributes
+        ]);
+    }
+}