Merge branch 'MC-30099' of https://github.com/magento-tango/magento2ce into Tango-PR-01-15-2020_23

Author: Roman Lytvynenko

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

@@ -14,7 +14,8 @@
 use Magento\Store\Model\Store;
 
 /**
- * Class Product
+ * Rule product condition data model
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
@@ -250,7 +251,7 @@ protected function addNotGlobalAttribute(
     public function getMappedSqlField()
     {
         $result = '';
-        if (in_array($this->getAttribute(), ['category_ids', 'sku'])) {
+        if (in_array($this->getAttribute(), ['category_ids', 'sku', 'attribute_set_id'])) {
             $result = parent::getMappedSqlField();
         } elseif (isset($this->joinedAttributes[$this->getAttribute()])) {
             $result = $this->joinedAttributes[$this->getAttribute()];

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

@@ -102,5 +102,7 @@ public function testGetMappedSqlFieldSku()
     {
         $this->model->setAttribute('sku');
         $this->assertEquals('e.sku', $this->model->getMappedSqlField());
+        $this->model->setAttribute('attribute_set_id');
+        $this->assertEquals('e.attribute_set_id', $this->model->getMappedSqlField());
     }
 }

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

@@ -625,6 +625,8 @@ public function getMappedSqlField()
             $mappedSqlField = $this->getEavAttributeTableAlias() . '.value';
         } elseif ($this->getAttribute() == 'category_ids') {
             $mappedSqlField = 'e.entity_id';
+        } elseif ($this->getAttribute() == 'attribute_set_id') {
+            $mappedSqlField = 'e.attribute_set_id';
         } else {
             $mappedSqlField = parent::getMappedSqlField();
         }

app/code/Magento/Rule/Test/Unit/Model/Condition/Product/AbstractProductTest.php

@@ -282,6 +282,8 @@ public function testGetMappedSqlField()
     {
         $this->_condition->setAttribute('category_ids');
         $this->assertEquals('e.entity_id', $this->_condition->getMappedSqlField());
+        $this->_condition->setAttribute('attribute_set_id');
+        $this->assertEquals('e.attribute_set_id', $this->_condition->getMappedSqlField());
     }
 
     /**
@@ -329,7 +331,7 @@ public function testPrepareValueOptions(
             ->willReturn($attributeObjectFrontendInput);
         $attributeObjectMock->method('getSource')->willReturn($attrObjectSourceMock);
 
-        $entityTypeMock = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel\Type::class)
+        $entityTypeMock = $this->getMockBuilder(\Magento\Eav\Model\Entity\Type::class)
             ->setMethods(['getId'])
             ->disableOriginalConstructor()
             ->getMock();