MAGETWO-86663: 11897: Catalog product list widget not working with multiple sku. #1050

Author: ishakhsuvarov

app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php

@@ -137,6 +137,7 @@ public function getDefaultOperatorInputByType()
              */
             $this->_defaultOperatorInputByType['category'] = ['==', '!=', '{}', '!{}', '()', '!()'];
             $this->_arrayInputTypes[] = 'category';
+            $this->_defaultOperatorInputByType['sku'] = ['==', '!=', '{}', '!{}', '()', '!()'];
         }
         return $this->_defaultOperatorInputByType;
     }
@@ -382,6 +383,9 @@ public function getInputType()
         if ($this->getAttributeObject()->getAttributeCode() == 'category_ids') {
             return 'category';
         }
+        if ($this->getAttributeObject()->getAttributeCode() == 'sku') {
+            return 'sku';
+        }
         switch ($this->getAttributeObject()->getFrontendInput()) {
             case 'select':
                 return 'select';
@@ -606,7 +610,12 @@ public function getBindArgumentValue()
                     $this->getValueParsed()
                 )->__toString()
             );
+        } elseif ($this->getAttribute() === 'sku') {
+            $value = $this->getData('value');
+            $value = preg_split('#\s*[,;]\s*#', $value, null, PREG_SPLIT_NO_EMPTY);
+            $this->setValueParsed($value);
         }
+
         return parent::getBindArgumentValue();
     }
 
@@ -704,7 +713,7 @@ protected function _getAttributeSetId($productId)
     public function getOperatorForValidate()
     {
         $operator = $this->getOperator();
-        if ($this->getInputType() == 'category') {
+        if (in_array($this->getInputType(), ['category', 'sku'])) {
             if ($operator == '==') {
                 $operator = '{}';
             } elseif ($operator == '!=') {

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

@@ -67,12 +67,36 @@ public function testCreateCollection()
             . '`attribute`:`multiselect_attribute`,`operator`:`^[^]`,'
             . '`value`:[`' . implode(',', $multiselectAttributeOptionIds) . '`]^]^]';
         $this->block->setData('conditions_encoded', $encodedConditions);
+        $this->performAssertions(1);
+    }
+
+    /**
+     * Test product list widget can process condition with multiple product sku.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     */
+    public function testCreateCollectionWithMultipleSkuCondition()
+    {
+        $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`:`sku`,`operator`:`==`,`value`:`simple1, simple2`^]^]';
+        $this->block->setData('conditions_encoded', $encodedConditions);
+        $this->performAssertions(2);
+    }
 
-        // Load products collection filtered using specified conditions and perform assesrions
+    /**
+     * Check product collection includes correct amount of products.
+     *
+     * @param int $count
+     * @return void
+     */
+    private function performAssertions(int $count)
+    {
+        // Load products collection filtered using specified conditions and perform assertions.
         $productCollection = $this->block->createCollection();
         $productCollection->load();
         $this->assertEquals(
-            1,
+            $count,
             $productCollection->count(),
             "Product collection was not filtered according to the widget condition."
         );