Merge remote-tracking branch 'origin/MAGETWO-67438-Widget-Conditions' into Okapis-develop-pr

Author: cpartica

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -237,6 +237,12 @@ public function createCollection()
         $conditions->collectValidatedAttributes($collection);
         $this->sqlBuilder->attachConditionToCollection($collection, $conditions);
 
+        /**
+         * Prevent retrieval of duplicate records. This may occur when multiselect product attribute matches
+         * several allowed values from condition simultaneously
+         */
+        $collection->distinct(true);
+
         return $collection;
     }
 

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -269,6 +269,7 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
                 'addStoreFilter',
                 'setPageSize',
                 'setCurPage',
+                'distinct'
             ])->disableOriginalConstructor()
             ->getMock();
         $collection->expects($this->once())->method('setVisibility')
@@ -282,6 +283,7 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
         $collection->expects($this->once())->method('addStoreFilter')->willReturnSelf();
         $collection->expects($this->once())->method('setPageSize')->with($expectedPageSize)->willReturnSelf();
         $collection->expects($this->once())->method('setCurPage')->willReturnSelf();
+        $collection->expects($this->once())->method('distinct')->willReturnSelf();
 
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $this->productsList->setData('conditions_encoded', 'some_serialized_conditions');

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/Indexer/Eav/SourceTest.php

@@ -114,7 +114,6 @@ public function testReindexMultiselectAttribute()
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
         $attr = $objectManager->get(\Magento\Eav\Model\Config::class)
            ->getAttribute('catalog_product', 'multiselect_attribute');
-        $attr->setIsFilterable(1)->save();
 
         /** @var $options \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection */
         $options = $objectManager->create(\Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection::class);

dev/tests/integration/testsuite/Magento/Catalog/_files/multiselect_attribute.php

@@ -24,7 +24,7 @@
         'is_searchable' => 0,
         'is_visible_in_advanced_search' => 0,
         'is_comparable' => 0,
-        'is_filterable' => 0,
+        'is_filterable' => 1,
         'is_filterable_in_search' => 0,
         'is_used_for_promo_rules' => 0,
         'is_html_allowed_on_front' => 1,

dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/ProductListTest.php

@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\CatalogWidget\Block\Product;
+
+/**
+ * Tests for @see \Magento\CatalogWidget\Block\Product\ProductsList
+ */
+class ProductListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Magento\CatalogWidget\Block\Product\ProductsList
+     */
+    protected $block;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->create(
+            \Magento\CatalogWidget\Block\Product\ProductsList::class
+        );
+    }
+
+    /**
+     * Make sure that widget conditions are applied to product collection correctly
+     *
+     * 1. Create new multiselect attribute with several options
+     * 2. Create 2 new products and select at least 2 multiselect options for one of these products
+     * 3. Create product list widget condition based on the new multiselect attribute
+     * 4. Set at least 2 options of multiselect attribute to match products for the product list widget
+     * 5. Load collection for product list widget and make sure that number of loaded products is correct
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products_with_multiselect_attribute.php
+     */
+    public function testCreateCollection()
+    {
+        // Reindex EAV attributes to enable products filtration by created multiselect attribute
+        /** @var \Magento\Catalog\Model\Indexer\Product\Eav\Processor $eavIndexerProcessor */
+        $eavIndexerProcessor = $this->objectManager->get(
+            \Magento\Catalog\Model\Indexer\Product\Eav\Processor::class
+        );
+        $eavIndexerProcessor->reindexAll();
+
+        // Prepare conditions
+        /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
+        $attribute = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
+        );
+        $attribute->load('multiselect_attribute', 'attribute_code');
+        $multiselectAttributeOptionIds = [];
+        foreach ($attribute->getOptions() as $option) {
+            if ($option->getValue()) {
+                $multiselectAttributeOptionIds[] = $option->getValue();
+            }
+        }
+        $encodedConditions = '^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,'
+            . '`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:'
+            . '^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,'
+            . '`attribute`:`multiselect_attribute`,`operator`:`^[^]`,'
+            . '`value`:[`' . implode(',', $multiselectAttributeOptionIds) . '`]^]^]';
+        $this->block->setData('conditions_encoded', $encodedConditions);
+
+        // Load products collection filtered using specified conditions and perform assesrions
+        $productCollection = $this->block->createCollection();
+        $productCollection->load();
+        $this->assertEquals(
+            1,
+            $productCollection->count(),
+            "Product collection was not filtered according to the widget condition."
+        );
+    }
+}

dev/tests/integration/testsuite/Magento/CatalogWidget/Block/Product/Widget/ConditionsTest.php

@@ -17,7 +17,7 @@ class ConditionsTest extends \PHPUnit_Framework_TestCase
     protected $block;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInt
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;