Merge remote-tracking branch 'arcticfoxes/MC-19450' into 2.3-develop-pr

Joan He · Joan He · commit 2713e1d87f72 · 2019-09-20T13:29:51.000-05:00
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -393,6 +393,7 @@ private function getSearchResultApplier(SearchResultInterface $searchResult): Se
             /** This variable sets by serOrder method, but doesn't have a getter method. */
             'orders' => $this->_orders,
             'size' => $this->getPageSize(),
+            'currentPage' => (int)$this->_curPage,
             ]
         );
     }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -195,10 +195,6 @@ public function cleanIndex($storeId, $mappedIndexerId)
     {
         $this->checkIndex($storeId, $mappedIndexerId, true);
         $indexName = $this->indexNameResolver->getIndexName($storeId, $mappedIndexerId, $this->preparedIndex);
-        if ($this->client->isEmptyIndex($indexName)) {
-            // use existing index if empty
-            return $this;
-        }
 
         // prepare new index name and increase version
         $indexPattern = $this->indexNameResolver->getIndexPattern($storeId, $mappedIndexerId);
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php b/dev/tests/integration/testsuite/Magento/Bundle/Model/Product/TypeTest.php
@@ -49,19 +49,20 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Bundle/_files/product.php
-     * @covers \Magento\Indexer\Model\Indexer::reindexAll
      * @covers \Magento\Bundle\Model\Product\Type::getSearchableData
      * @magentoDbIsolation disabled
      */
-    public function testPrepareProductIndexForBundleProduct()
+    public function testGetSearchableData()
     {
-        $this->indexer->reindexAll();
-
-        $select = $this->connectionMock->select()->from($this->resource->getTableName('catalogsearch_fulltext_scope1'))
-            ->where('`data_index` LIKE ?', '%' . 'Bundle Product Items' . '%');
+        $productRepository = $this->objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        /** @var \Magento\Catalog\Model\Product $bundleProduct */
+        $bundleProduct = $productRepository->get('bundle-product');
+        $bundleType = $bundleProduct->getTypeInstance();
+        /** @var \Magento\Bundle\Model\Product\Type $bundleType */
+        $searchableData = $bundleType->getSearchableData($bundleProduct);
 
-        $result = $this->connectionMock->fetchAll($select);
-        $this->assertCount(1, $result);
+        $this->assertCount(1, $searchableData);
+        $this->assertEquals('Bundle Product Items', $searchableData[0]);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/FlatTest.php
@@ -246,6 +246,7 @@ public function testDeleteCategory()
      *
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true
      * @magentoAppArea frontend
+     * @magentoDbIsolation disabled
      */
     public function testFlatAfterDeleted()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Eav/Action/FullTest.php
@@ -32,7 +32,7 @@ public static function setUpBeforeClass()
 
     protected function setUp()
     {
-        $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $this->_processor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Indexer\Product\Eav\Processor::class
         );
     }
@@ -46,24 +46,24 @@ protected function setUp()
     public function testReindexAll()
     {
         /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $attr **/
-        $attr = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class)
+        $attr = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Eav\Model\Config::class)
             ->getAttribute('catalog_product', 'weight');
         $attr->setIsFilterable(1)->save();
 
         $this->assertTrue($attr->isIndexable());
 
-        $priceIndexerProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $priceIndexerProcessor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\Indexer\Product\Price\Processor::class
         );
         $priceIndexerProcessor->reindexAll();
 
         $this->_processor->reindexAll();
 
-        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $categoryFactory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Model\CategoryFactory::class
         );
         /** @var \Magento\Catalog\Block\Product\ListProduct $listProduct */
-        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+        $listProduct = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Catalog\Block\Product\ListProduct::class
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -81,6 +81,7 @@ public function getRangeItemCountsDataProvider()
     /**
      * @magentoDataFixture Magento/Catalog/_files/categories.php
      * @magentoDbIsolation disabled
+     * @magentoConfigFixture default/catalog/search/engine mysql
      * @dataProvider getRangeItemCountsDataProvider
      */
     public function testGetRangeItemCounts($inputRange, $expectedItemCounts)
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/UrlTest.php
@@ -49,6 +49,7 @@ public function testGetUrlInStore()
      * @magentoConfigFixture fixturestore_store web/unsecure/base_url http://sample-second.com/
      * @magentoConfigFixture fixturestore_store web/unsecure/base_link_url http://sample-second.com/
      * @magentoDataFixture Magento/Catalog/_files/product_simple_multistore.php
+     * @magentoDbIsolation disabled
      * @dataProvider getUrlsWithSecondStoreProvider
      * @magentoAppArea adminhtml
      */
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/ResultTest.php
@@ -8,6 +8,7 @@
 /**
  * @magentoDbIsolation enabled
  * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
  */
 class ResultTest extends \Magento\TestFramework\TestCase\AbstractController
 {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProviderTest.php
@@ -28,7 +28,8 @@ public function testSearchProductByAttribute()
         $requestBuilder->setRequestName('quick_search_container');
         $queryRequest = $requestBuilder->create();
         /** @var \Magento\Framework\Search\Adapter\Mysql\Adapter $adapter */
-        $adapter = $objectManager->create(\Magento\Framework\Search\Adapter\Mysql\Adapter::class);
+        $adapterFactory = $objectManager->create(\Magento\Search\Model\AdapterFactory::class);
+        $adapter = $adapterFactory->create();
         $queryResponse = $adapter->query($queryRequest);
         $actualIds = [];
         foreach ($queryResponse as $document) {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -19,35 +19,32 @@
  */
 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(
-            \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class
-        );
-    }
-
     /**
      * 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
+     * @magentoConfigFixture default/catalog/search/engine mysql
      */
     public function testGetIndexData()
     {
+        $engineProvider = Bootstrap::getObjectManager()->create(
+            \Magento\CatalogSearch\Model\ResourceModel\EngineProvider::class
+        );
+        $dataProvider = Bootstrap::getObjectManager()->create(
+            \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider::class,
+            ['engineProvider' => $engineProvider]
+        );
+        $actionFull = Bootstrap::getObjectManager()->create(
+            \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class,
+            ['dataProvider' => $dataProvider]
+        );
         /** @var ProductRepositoryInterface $productRepository */
         $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));
+        $result = iterator_to_array($actionFull->rebuildStoreIndex(Store::DISTRO_STORE_ID));
         $this->assertNotEmpty($result);
 
         $productsIds = array_keys($result);
@@ -132,6 +129,9 @@ private function getExpectedIndexData()
      */
     public function testRebuildStoreIndexConfigurable()
     {
+        $actionFull = Bootstrap::getObjectManager()->create(
+            \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class
+        );
         $storeId = 1;
 
         $simpleProductId = $this->getIdBySku('simple_10');
@@ -141,8 +141,8 @@ public function testRebuildStoreIndexConfigurable()
             $simpleProductId,
             $configProductId
         ];
-        $storeIndexDataSimple = $this->actionFull->rebuildStoreIndex($storeId, [$simpleProductId]);
-        $storeIndexDataExpected = $this->actionFull->rebuildStoreIndex($storeId, $expected);
+        $storeIndexDataSimple = $actionFull->rebuildStoreIndex($storeId, [$simpleProductId]);
+        $storeIndexDataExpected = $actionFull->rebuildStoreIndex($storeId, $expected);
 
         $this->assertEquals($storeIndexDataSimple, $storeIndexDataExpected);
     }
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php
@@ -9,7 +9,6 @@
 
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -76,10 +75,6 @@ protected function setUp()
         );
         $this->indexer->load('catalogsearch_fulltext');
 
-        $this->engine = Bootstrap::getObjectManager()->get(
-            \Magento\CatalogSearch\Model\ResourceModel\Engine::class
-        );
-
         $this->queryFactory = Bootstrap::getObjectManager()->get(
             \Magento\Search\Model\QueryFactory::class
         );
@@ -223,12 +218,8 @@ protected function search(string $text, $visibilityFilter = null): array
         $query->setQueryText($text);
         $query->saveIncrementalPopularity();
         $products = [];
-        $collection = Bootstrap::getObjectManager()->create(
-            Collection::class,
-            [
-                'searchRequestName' => 'quick_search_container'
-            ]
-        );
+        $searchLayer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Layer\Search::class);
+        $collection = $searchLayer->getProductCollection();
         $collection->addSearchFilter($text);
 
         if (null !== $visibilityFilter) {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Advanced/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Advanced/CollectionTest.php
@@ -18,8 +18,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->advancedCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\CatalogSearch\Model\ResourceModel\Advanced\Collection::class);
+        $advanced = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(\Magento\CatalogSearch\Model\Search\ItemCollectionProvider::class);
+        $this->advancedCollection = $advanced->getCollection();
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -14,6 +14,9 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
     /**
      * @dataProvider filtersDataProviderSearch
      * @magentoDataFixture Magento/Framework/Search/_files/products.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     * @magentoConfigFixture default/catalog/search/engine mysql
+     * @magentoAppIsolation enabled
      */
     public function testLoadWithFilterSearch($request, $filters, $expectedCount)
     {
@@ -31,6 +34,42 @@ public function testLoadWithFilterSearch($request, $filters, $expectedCount)
         $this->assertCount($expectedCount, $items);
     }
 
+    /**
+     * @dataProvider filtersDataProviderQuickSearch
+     * @magentoDataFixture Magento/Framework/Search/_files/products.php
+     */
+    public function testLoadWithFilterQuickSearch($filters, $expectedCount)
+    {
+        $objManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $searchLayer = $objManager->create(\Magento\Catalog\Model\Layer\Search::class);
+        /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
+        $fulltextCollection = $searchLayer->getProductCollection();
+        foreach ($filters as $field => $value) {
+            $fulltextCollection->addFieldToFilter($field, $value);
+        }
+        $fulltextCollection->loadWithFilter();
+        $items = $fulltextCollection->getItems();
+        $this->assertCount($expectedCount, $items);
+    }
+
+    /**
+     * @dataProvider filtersDataProviderCatalogView
+     * @magentoDataFixture Magento/Framework/Search/_files/products.php
+     */
+    public function testLoadWithFilterCatalogView($filters, $expectedCount)
+    {
+        $objManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $searchLayer = $objManager->create(\Magento\Catalog\Model\Layer\Category::class);
+        /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
+        $fulltextCollection = $searchLayer->getProductCollection();
+        foreach ($filters as $field => $value) {
+            $fulltextCollection->addFieldToFilter($field, $value);
+        }
+        $fulltextCollection->loadWithFilter();
+        $items = $fulltextCollection->getItems();
+        $this->assertCount($expectedCount, $items);
+    }
+
     /**
      * @magentoDataFixture Magento/Framework/Search/_files/products_with_the_same_search_score.php
      */
@@ -42,11 +81,9 @@ public function testSearchResultsAreTheSameForSameRequests()
         $objManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
         foreach (range(1, $howManySearchRequests) as $i) {
+            $searchLayer = $objManager->create(\Magento\Catalog\Model\Layer\Search::class);
             /** @var  \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection $fulltextCollection */
-            $fulltextCollection = $objManager->create(
-                \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection::class,
-                ['searchRequestName' => 'quick_search_container']
-            );
+            $fulltextCollection = $searchLayer->getProductCollection();
 
             $fulltextCollection->addFieldToFilter('search_term', 'shorts');
             $fulltextCollection->setOrder('relevance');
@@ -81,4 +118,22 @@ public function filtersDataProviderSearch()
             ['catalog_view_container', [], 0],
         ];
     }
+
+    public function filtersDataProviderQuickSearch()
+    {
+        return [
+            [['search_term' => '  shorts'], 2],
+            [['search_term' => 'nonexistent'], 0],
+        ];
+    }
+
+    public function filtersDataProviderCatalogView()
+    {
+        return [
+            [['category_ids' => 2], 5],
+            [['category_ids' => 100001], 0],
+            [['category_ids' => []], 5],
+            [[], 5],
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Controller/Adminhtml/Category/SaveTest.php
@@ -13,7 +13,6 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Indexer\Category\Product as CategoryIndexer;
 use Magento\CatalogSearch\Model\Indexer\Fulltext as FulltextIndexer;
-use Magento\Elasticsearch\Model\Config;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
@@ -35,13 +34,6 @@ protected function setUp()
     {
         parent::setUp();
 
-        $config = $this->getMockBuilder(Config::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $config->method('isElasticsearchEnabled')
-            ->willReturn(true);
-        $this->_objectManager->addSharedInstance($config, Config::class);
-
         $this->changeIndexerSchedule(FulltextIndexer::INDEXER_ID, true);
         $this->changeIndexerSchedule(CategoryIndexer::INDEXER_ID, true);
     }
@@ -51,7 +43,6 @@ protected function setUp()
      */
     protected function tearDown()
     {
-        $this->_objectManager->removeSharedInstance(Config::class);
         $this->changeIndexerSchedule(FulltextIndexer::INDEXER_ID, $this->indexerSchedule[FulltextIndexer::INDEXER_ID]);
         $this->changeIndexerSchedule(CategoryIndexer::INDEXER_ID, $this->indexerSchedule[CategoryIndexer::INDEXER_ID]);
 
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
@@ -15,6 +15,7 @@ class UrlRewriteTest extends AbstractController
 {
     /**
      * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
+     * @magentoDbIsolation disabled
      *
      * @covers \Magento\UrlRewrite\Controller\Router::match
      * @covers \Magento\UrlRewrite\Model\Storage\DbStorage::doFindOneByData
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Model/StoreSwitcher/RewriteUrlTest.php
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite_rollback.php

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,7 @@ private function getSearchResultApplier(SearchResultInterface $searchResult): Se`
`393`	`393`	`/** This variable sets by serOrder method, but doesn't have a getter method. */`
`394`	`394`	`'orders' => $this->_orders,`
`395`	`395`	`'size' => $this->getPageSize(),`
	`396`	`+ 'currentPage' => (int)$this->_curPage,`
`396`	`397`	`]`
`397`	`398`	`);`
`398`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ public function testDeleteCategory()`
`246`	`246`	`*`
`247`	`247`	`* @magentoConfigFixture current_store catalog/frontend/flat_catalog_category true`
`248`	`248`	`* @magentoAppArea frontend`
	`249`	`+ * @magentoDbIsolation disabled`
`249`	`250`	`*/`
`250`	`251`	`public function testFlatAfterDeleted()`
`251`	`252`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`/**`
`9`	`9`	`* @magentoDbIsolation enabled`
`10`	`10`	`* @magentoAppIsolation enabled`
	`11`	`+ * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php`
`11`	`12`	`*/`
`12`	`13`	`class ResultTest extends \Magento\TestFramework\TestCase\AbstractController`
`13`	`14`	`{`