Merge branch 'ACP2E-1307' of https://github.com/magento-l3/magento2ce into ACP2E-1307

Author: alzota

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

@@ -189,7 +189,12 @@ public function getMappedSqlFieldPriceDataProvider(): array
             [
                 false,
                 false,
-                'e.entity_id'
+                'at_price.value'
+            ],
+            [
+                false,
+                true,
+                'price_index.min_price'
             ],
         ];
     }
@@ -248,7 +253,7 @@ public function getBindArgumentValueDataProvider(): array
                         1 => 2
                     ]
                 ],
-                new \Zend_Db_Expr('1, 3')
+                '2'
             ],
             [
                 [

dev/tests/integration/testsuite/Magento/CatalogWidget/Model/Rule/Condition/ProductTest.php

@@ -102,11 +102,11 @@ public function testAddNonGlobalAttributeToCollectionNoProducts()
         $this->conditionProduct->addToCollection($collection);
         $collectedAttributes = $this->conditionProduct->getRule()->getCollectedAttributes();
         $this->assertArrayHasKey('visibility', $collectedAttributes);
-        $query = (string)$collection->getSelect();
-        $this->assertStringNotContainsString('visibility', $query);
-        $this->assertEquals('', $this->conditionProduct->getMappedSqlField());
+        $this->assertEquals(0, $collection->getSize());
+        $this->assertStringContainsString('visibility', (string)$this->conditionProduct->getMappedSqlField());
         $this->assertFalse($this->conditionProduct->hasValueParsed());
-        $this->assertFalse($this->conditionProduct->hasValue());
+        $this->assertTrue($this->conditionProduct->hasValue());
+        $this->assertEquals('4', $this->conditionProduct->getValue());
     }
 
     /**
@@ -121,9 +121,11 @@ public function testAddNonGlobalAttributeToCollection()
         $this->conditionProduct->addToCollection($collection);
         $collectedAttributes = $this->conditionProduct->getRule()->getCollectedAttributes();
         $this->assertArrayHasKey('visibility', $collectedAttributes);
-        $query = (string)$collection->getSelect();
-        $this->assertStringNotContainsString('visibility', $query);
-        $this->assertEquals('e.entity_id', $this->conditionProduct->getMappedSqlField());
+        $this->assertEquals(1, $collection->getSize());
+        $this->assertStringContainsString('visibility', (string)$this->conditionProduct->getMappedSqlField());
+        $this->assertFalse($this->conditionProduct->hasValueParsed());
+        $this->assertTrue($this->conditionProduct->hasValue());
+        $this->assertEquals('4', $this->conditionProduct->getValue());
     }
 
     /**