MAGE-1226: updated page tests

Author: damcou

Test/Integration/Indexing/Page/MultiStorePagesTest.php

@@ -5,7 +5,7 @@
 use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
 use Algolia\AlgoliaSearch\Exceptions\ExceededRetriesException;
 use Algolia\AlgoliaSearch\Helper\ConfigHelper;
-use Algolia\AlgoliaSearch\Model\Indexer\Page;
+use Algolia\AlgoliaSearch\Service\Page\BatchQueueProcessor as PageBatchQueueProcessor;
 use Algolia\AlgoliaSearch\Test\Integration\Indexing\MultiStoreTestCase;
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
@@ -21,27 +21,26 @@
  */
 class MultiStorePagesTest extends MultiStoreTestCase
 {
-    /** @var Page */
-    protected $pagesIndexer;
-
     /** @var PageRepositoryInterface */
     protected $pageRepository;
 
     /**  @var CollectionFactory */
     private $pageCollectionFactory;
 
+    /** @var PageBatchQueueProcessor */
+    protected $pageBatchQueueProcessor;
+
     const HOME_PAGE_ID = 2;
 
     public function setUp():void
     {
         parent::setUp();
 
-        $this->pagesIndexer = $this->objectManager->get(Page::class);
         $this->pageRepository = $this->objectManager->get(PageRepositoryInterface::class);
         $this->pageCollectionFactory = $this->objectManager->get(CollectionFactory::class);
 
-        $this->pagesIndexer->executeFull();
-        $this->algoliaHelper->waitLastTask();
+        $this->pageBatchQueueProcessor = $this->objectManager->get(PageBatchQueueProcessor::class);
+        $this->reindexToAllStores($this->pageBatchQueueProcessor);
     }
 
     /***
@@ -77,10 +76,7 @@ public function testMultiStorePageIndices()
         $homePage->setStores([$defaultStore->getId()]);
         $this->pageRepository->save($homePage);
 
-        $this->pagesIndexer->execute([self::HOME_PAGE_ID]);
-
-        $this->algoliaHelper->waitLastTask($defaultStore->getId());
-        $this->algoliaHelper->waitLastTask($fixtureSecondStore->getId());
+        $this->reindexToAllStores($this->pageBatchQueueProcessor, [self::HOME_PAGE_ID]);
 
         $this->assertNbOfRecordsPerStore(
             $defaultStore->getCode(),

Test/Integration/Indexing/Page/PagesIndexingTest.php

@@ -3,7 +3,7 @@
 namespace Algolia\AlgoliaSearch\Test\Integration\Indexing\Page;
 
 use Algolia\AlgoliaSearch\Helper\Entity\PageHelper;
-use Algolia\AlgoliaSearch\Model\Indexer\Page;
+use Algolia\AlgoliaSearch\Service\Page\BatchQueueProcessor as PageBatchQueueProcessor;
 use Algolia\AlgoliaSearch\Test\Integration\Indexing\IndexingTestCase;
 use Magento\Cms\Model\PageFactory;
 
@@ -16,10 +16,8 @@ public function testNoExcludedPages()
             $this->getSerializer()->serialize([])
         );
 
-        /** @var Page $indexer */
-        $indexer = $this->getObjectManager()->create(Page::class);
-
-        $this->processTest($indexer, 'pages', $this->assertValues->expectedPages);
+        $pageBatchQueueProcessor = $this->objectManager->get(PageBatchQueueProcessor::class);
+        $this->processTest($pageBatchQueueProcessor, 'pages', $this->assertValues->expectedPages);
     }
 
     public function testExcludedPages()
@@ -33,9 +31,8 @@ public function testExcludedPages()
             $this->getSerializer()->serialize($excludedPages)
         );
 
-        /** @var Page $indexer */
-        $indexer = $this->getObjectManager()->create(Page::class);
-        $this->processTest($indexer, 'pages', $this->assertValues->expectedExcludePages);
+        $pageBatchQueueProcessor = $this->objectManager->get(PageBatchQueueProcessor::class);
+        $this->processTest($pageBatchQueueProcessor, 'pages', $this->assertValues->expectedExcludePages);
 
         $response = $this->algoliaHelper->query($this->indexPrefix . 'default_pages', '', []);
         $hits = reset($response['results'])['hits'];
@@ -61,10 +58,8 @@ public function testExcludedPages()
 
     public function testDefaultIndexableAttributes()
     {
-        /** @var Page $indexer */
-        $indexer = $this->getObjectManager()->create(Page::class);
-        $indexer->executeFull();
-
+        $pageBatchQueueProcessor = $this->objectManager->get(PageBatchQueueProcessor::class);
+        $pageBatchQueueProcessor->processBatch(1);
         $this->algoliaHelper->waitLastTask();
 
         $response = $this->algoliaHelper->query($this->indexPrefix . 'default_pages', '', ['hitsPerPage' => 1]);