Merge branch 'ACP2E-1870' of https://github.com/magento-l3/magento2ce into PR-L3-2023-05-11

Author: vkolesny

app/code/Magento/CatalogSearch/etc/search_request.xml

@@ -67,7 +67,7 @@
         <queries>
             <query xsi:type="boolQuery" name="advanced_search_container" boost="1">
                 <queryReference clause="should" ref="sku_query"/>
-                <queryReference clause="should" ref="price_query"/>
+                <queryReference clause="must" ref="price_query"/>
                 <queryReference clause="should" ref="category_query"/>
                 <queryReference clause="must" ref="visibility_query"/>
             </query>

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php

@@ -165,6 +165,42 @@ public function testExecuteWithArrayInParam(array $searchParams): void
         );
     }
 
+    /**
+     * Advanced search test by difference product attributes.
+     *
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     * @dataProvider testDataForAttributesCombination
+     *
+     * @param array $searchParams
+     * @param bool $isProductShown
+     * @return void
+     */
+    public function testExecuteForAttributesCombination(array $searchParams, bool $isProductShown): void
+    {
+        $this->getRequest()->setQuery(
+            $this->_objectManager->create(
+                Parameters::class,
+                [
+                    'values' => $searchParams
+                ]
+            )
+        );
+        $this->dispatch('catalogsearch/advanced/result');
+        $responseBody = $this->getResponse()->getBody();
+
+        if ($isProductShown) {
+            $this->assertStringContainsString('Simple product name', $responseBody);
+        } else {
+            $this->assertStringContainsString(
+                'We can't find any items matching these search criteria.',
+                $responseBody
+            );
+        }
+        $this->assertStringNotContainsString('Not visible simple product', $responseBody);
+    }
+
     /**
      * Data provider with array in params values
      *
@@ -339,4 +375,71 @@ private function getAttributeOptionValueByOptionLabel(string $attributeCode, str
 
         return $attribute->getSource()->getOptionId($optionLabel);
     }
+
+    /**
+     * Data provider with strings for quick search.
+     *
+     * @return array
+     */
+    public function testDataForAttributesCombination(): array
+    {
+        return [
+            'search_product_by_name_and_price' => [
+                [
+                    'name' => 'Simple product name',
+                    'sku' => '',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        'from' => 99,
+                        'to' => 101,
+                    ],
+                    'test_searchable_attribute' => '',
+                ],
+                true
+            ],
+            'search_product_by_name_and_price_not_shown' => [
+                [
+                    'name' => 'Simple product name',
+                    'sku' => '',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        'from' => 101,
+                        'to' => 102,
+                    ],
+                    'test_searchable_attribute' => '',
+                ],
+                false
+            ],
+            'search_product_by_sku' => [
+                [
+                    'name' => '',
+                    'sku' => 'simple_for_search',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        'from' => 99,
+                        'to' => 101,
+                    ],
+                    'test_searchable_attribute' => '',
+                ],
+                true
+            ],
+            'search_product_by_sku_not_shown' => [
+                [
+                    'name' => '',
+                    'sku' => 'simple_for_search',
+                    'description' => '',
+                    'short_description' => '',
+                    'price' => [
+                        'from' => 990,
+                        'to' => 1010,
+                    ],
+                    'test_searchable_attribute' => '',
+                ],
+                false
+            ],
+        ];
+    }
 }