Merge remote-tracking branch 'remotes/github/MAGETWO-91750' into EPAM-PR-30

Author: VeronikaYarats

app/code/Magento/CatalogSearch/Model/ResourceModel/Engine.php

@@ -110,7 +110,9 @@ public function processAttributeValue($attribute, $value)
             && in_array($attribute->getFrontendInput(), ['text', 'textarea'])
         ) {
             $result = $value;
-        } elseif ($this->isTermFilterableAttribute($attribute)) {
+        } elseif ($this->isTermFilterableAttribute($attribute)
+            || ($attribute->getIsSearchable() && in_array($attribute->getFrontendInput(), ['select', 'multiselect']))
+        ) {
             $result = '';
         }
 
@@ -119,6 +121,7 @@ public function processAttributeValue($attribute, $value)
 
     /**
      * Prepare index array as a string glued by separator
+     *
      * Support 2 level array gluing
      *
      * @param array $index

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php

@@ -14,13 +14,19 @@
 use Magento\Catalog\Model\Product;
 use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * Class for testing fulltext index rebuild
+ */
 class FullTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full
      */
     protected $actionFull;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->actionFull = Bootstrap::getObjectManager()->create(
@@ -29,6 +35,8 @@ protected function setUp()
     }
 
     /**
+     * Testing fulltext index rebuild
+     *
      * @magentoDataFixture Magento/CatalogSearch/_files/products_for_index.php
      * @magentoDataFixture Magento/CatalogSearch/_files/product_configurable_not_available.php
      * @magentoDataFixture Magento/Framework/Search/_files/product_configurable.php
@@ -39,7 +47,6 @@ public function testGetIndexData()
         $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
         $allowedStatuses = Bootstrap::getObjectManager()->get(Status::class)->getVisibleStatusIds();
         $allowedVisibility = Bootstrap::getObjectManager()->get(Engine::class)->getAllowedVisibility();
-
         $result = iterator_to_array($this->actionFull->rebuildStoreIndex(Store::DISTRO_STORE_ID));
         $this->assertNotEmpty($result);
 
@@ -58,7 +65,10 @@ public function testGetIndexData()
     }
 
     /**
+     * Prepare and return expected index data
+     *
      * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getExpectedIndexData()
     {
@@ -68,32 +78,48 @@ private function getExpectedIndexData()
         $nameId = $attributeRepository->get(ProductInterface::NAME)->getAttributeId();
         /** @see dev/tests/integration/testsuite/Magento/Framework/Search/_files/configurable_attribute.php */
         $configurableId = $attributeRepository->get('test_configurable')->getAttributeId();
+        $statusId = $attributeRepository->get(ProductInterface::STATUS)->getAttributeId();
+        $taxClassId = $attributeRepository
+            ->get(\Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID)
+            ->getAttributeId();
         return [
             'configurable' => [
                 $skuId => 'configurable',
                 $configurableId => 'Option 1 | Option 2',
                 $nameId => 'Configurable Product | Configurable OptionOption 1 | Configurable OptionOption 2',
+                $taxClassId => 'Taxable Goods | Taxable Goods | Taxable Goods',
+                $statusId => 'Enabled | Enabled | Enabled'
             ],
             'index_enabled' => [
                 $skuId => 'index_enabled',
                 $nameId => 'index enabled',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ],
             'index_visible_search' => [
                 $skuId => 'index_visible_search',
                 $nameId => 'index visible search',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ],
             'index_visible_category' => [
                 $skuId => 'index_visible_category',
                 $nameId => 'index visible category',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ],
             'index_visible_both' => [
                 $skuId => 'index_visible_both',
                 $nameId => 'index visible both',
+                $taxClassId => 'Taxable Goods',
+                $statusId => 'Enabled'
             ]
         ];
     }
 
     /**
+     * Testing fulltext index rebuild with configurations
+     *
      * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      */
     public function testRebuildStoreIndexConfigurable()
@@ -114,6 +140,8 @@ public function testRebuildStoreIndexConfigurable()
     }
 
     /**
+     * Get product Id by its SKU
+     *
      * @param string $sku
      * @return int
      */