Merge branch 'MAGETWO-69714' of github.com:magento-troll/magento2ce into PR_Troll

Author: slopukhov

app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php

@@ -180,15 +180,8 @@ protected function updateValues(array $valuesToUpdate, array $oldValues)
     {
         $isChanged = false;
         foreach ($valuesToUpdate as $key => $value) {
-            $oldPrice = $this->prepareFloatValue($oldValues[$key]['price']);
-            $newPrice = $this->prepareFloatValue($value['value']);
-            $oldQty = $this->prepareFloatValue($oldValues[$key]['price_qty']);
-            $newQty = $this->prepareFloatValue($value['qty']);
-            $oldPercentageValue = $this->prepareFloatValue($this->getPercentage($oldValues[$key]));
-            $newPercentageValue = $this->prepareFloatValue($this->getPercentage($value));
-            if (($oldPrice !== $newPrice)
-                || ($oldQty !== $newQty)
-                || ($oldPercentageValue !== $newPercentageValue)
+            if ($oldValues[$key]['price'] != $value['value']
+                || $this->getPercentage($oldValues[$key]) != $this->getPercentage($value)
             ) {
                 $price = new \Magento\Framework\DataObject(
                     [
@@ -205,17 +198,6 @@ protected function updateValues(array $valuesToUpdate, array $oldValues)
         return $isChanged;
     }
 
-    /**
-     * Prepare float value for comparison
-     *
-     * @param string|float|int $value
-     * @return float
-     */
-    private function prepareFloatValue($value)
-    {
-        return floatval(str_replace(',', '.', (string)$value));
-    }
-
     /**
      * Check whether price has percentage value.
      *

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

@@ -222,7 +222,7 @@ protected function addNotGlobalAttribute(
     public function getMappedSqlField()
     {
         $result = '';
-        if ($this->getAttribute() == 'category_ids') {
+        if (in_array($this->getAttribute(), ['category_ids', 'sku'])) {
             $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

@@ -36,11 +36,11 @@ protected function setUp()
             '',
             false
         );
-        $eavConfig->expects($this->once())->method('getAttribute')->willReturn($this->attributeMock);
+        $eavConfig->expects($this->any())->method('getAttribute')->willReturn($this->attributeMock);
         $ruleMock = $this->getMock(\Magento\SalesRule\Model\Rule::class, [], [], '', false);
         $storeManager = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
         $storeMock = $this->getMock(\Magento\Store\Api\Data\StoreInterface::class);
-        $storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
+        $storeManager->expects($this->any())->method('getStore')->willReturn($storeMock);
         $this->resourceMock = $this->getMock(
             \Magento\Indexer\Model\ResourceModel\FrontendResource::class,
             [],
@@ -49,8 +49,8 @@ protected function setUp()
             false
         );
         $productResource = $this->getMock(\Magento\Catalog\Model\ResourceModel\Product::class, [], [], '', false);
-        $productResource->expects($this->once())->method('loadAllAttributes')->willReturnSelf();
-        $productResource->expects($this->once())->method('getAttributesByCode')->willReturn([]);
+        $productResource->expects($this->any())->method('loadAllAttributes')->willReturnSelf();
+        $productResource->expects($this->any())->method('getAttributesByCode')->willReturn([]);
         $this->model = $objectManagerHelper->getObject(
             \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
             [
@@ -88,4 +88,10 @@ public function testAddToCollection()
         $this->resourceMock->expects($this->once())->method('getMainTable')->willReturn('catalog_product_index_eav');
         $this->model->addToCollection($collectionMock);
     }
+
+    public function testGetMappedSqlFieldSku()
+    {
+        $this->model->setAttribute('sku');
+        $this->assertEquals('e.sku', $this->model->getMappedSqlField());
+    }
 }

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

@@ -94,4 +94,13 @@ public function testGetMappedSqlFieldCategoryIdsAttribute()
         $this->conditionProduct->setAttribute('category_ids');
         $this->assertEquals('e.entity_id', $this->conditionProduct->getMappedSqlField());
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     */
+    public function testGetMappedSqlFieldSkuAttribute()
+    {
+        $this->conditionProduct->setAttribute('sku');
+        $this->assertEquals('e.sku', $this->conditionProduct->getMappedSqlField());
+    }
 }