Merge branch 'MC-40672' of https://github.com/magento-l3/magento2ce into TANGO_PR-02-03-2021_24

Author: thiaramus

app/code/Magento/Elasticsearch/etc/di.xml

@@ -506,6 +506,7 @@
                 <item name="default" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\TextTransformer</item>
                 <item name="date" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\DateTransformer</item>
                 <item name="float" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\FloatTransformer</item>
+                <item name="double" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\FloatTransformer</item>
                 <item name="integer" xsi:type="object">Magento\Elasticsearch\SearchAdapter\Query\ValueTransformer\IntegerTransformer</item>
             </argument>
         </arguments>

dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes.php

@@ -90,6 +90,25 @@
 /* Assign attribute to attribute set */
 $installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $dateAttribute->getId());
 
+$decimalAttribute = Bootstrap::getObjectManager()->create(Attribute::class);
+$decimalAttribute->setData(
+    [
+        'attribute_code' => 'decimal_attribute',
+        'entity_type_id' => $productEntityTypeId,
+        'is_global' => 1,
+        'is_filterable' => 1,
+        'is_user_defined' => 1,
+        'backend_type' => 'decimal',
+        'frontend_input' => 'weight',
+        'frontend_label' => 'Test Decimal',
+        'is_searchable' => 1,
+        'is_filterable_in_search' => 1,
+    ]
+);
+$decimalAttribute->save();
+/* Assign attribute to attribute set */
+$installer->addAttributeToGroup($productEntityTypeId, 'Default', 'General', $decimalAttribute->getId());
+
 $productAttributeSetId = $installer->getAttributeSetId($productEntityTypeId, 'Default');
 /* Create simple products per each first attribute option */
 foreach ($selectOptions[1] as $option) {
@@ -127,6 +146,7 @@
             $selectAttributes[1]->getAttributeCode() => $option->getId(),
             $selectAttributes[2]->getAttributeCode() => $selectOptions[2]->getLastItem()->getId(),
             $dateAttribute->getAttributeCode() => '10/30/2000',
+            $decimalAttribute->getAttributeCode() => 1.11,
         ],
         $product->getStoreId()
     );

dev/tests/integration/testsuite/Magento/Framework/Search/_files/filterable_attributes_rollback.php

@@ -42,5 +42,10 @@
     $attribute->delete();
 }
 
+$attribute->loadByCode($productEntityTypeId, 'decimal_attribute');
+if ($attribute->getId()) {
+    $attribute->delete();
+}
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);