MAGETWO-60602: [Github] Combine widget rule #7274

Author: irenelagno

app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php

@@ -82,7 +82,7 @@ public function getNewChildSelectOptions()
     public function collectValidatedAttributes($productCollection)
     {
         foreach ($this->getConditions() as $condition) {
-            $condition->addToCollection($productCollection);
+            $condition->collectValidatedAttributes($productCollection);
         }
         return $this;
     }

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

@@ -223,4 +223,12 @@ public function getMappedSqlField()
 
         return $result;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function collectValidatedAttributes($productCollection)
+    {
+        return $this->addToCollection($productCollection);
+    }
 }

app/code/Magento/CatalogWidget/Test/Unit/Model/Rule/Condition/CombineTest.php

@@ -80,9 +80,9 @@ public function testCollectValidatedAttributes()
             ->disableOriginalConstructor()
             ->getMock();
         $condition = $this->getMockBuilder(\Magento\CatalogWidget\Model\Rule\Condition\Combine::class)
-            ->disableOriginalConstructor()->setMethods(['addToCollection'])
+            ->disableOriginalConstructor()->setMethods(['collectValidatedAttributes'])
             ->getMock();
-        $condition->expects($this->any())->method('addToCollection')->with($collection)
+        $condition->expects($this->any())->method('collectValidatedAttributes')->with($collection)
             ->will($this->returnSelf());
 
         $this->condition->setConditions([$condition]);