Merge remote-tracking branch 'origin/MC-19537' into 2.3-develop-pr31

Author: serhii-balko

app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolver.php

@@ -76,7 +76,9 @@ public function __construct(
      */
     public function resolve(): SearchCriteria
     {
-        $this->builder->setPageSize($this->size);
+        if ($this->size !== 0) {
+            $this->builder->setPageSize($this->size);
+        }
         $searchCriteria = $this->builder->create();
         $searchCriteria->setRequestName($this->searchRequestName);
         $searchCriteria->setSortOrders($this->orders);

app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/Fulltext/Collection/SearchCriteriaResolverTest.php

@@ -34,15 +34,18 @@ protected function setUp()
     }
 
     /**
-     * @param array|null $orders
-     * @param array|null $expected
+     * @param array $params
+     * @param array $expected
      * @dataProvider resolveSortOrderDataProvider
      */
-    public function testResolve($orders, $expected)
+    public function testResolve($params, $expected)
     {
         $searchRequestName = 'test';
         $currentPage = 1;
-        $size = 10;
+        $size = $params['size'];
+        $expectedSize = $expected['size'];
+        $orders = $params['orders'];
+        $expectedOrders = $expected['orders'];
 
         $searchCriteria = $this->getMockBuilder(SearchCriteria::class)
             ->disableOriginalConstructor()
@@ -54,7 +57,7 @@ public function testResolve($orders, $expected)
             ->willReturn($searchCriteria);
         $searchCriteria->expects($this->once())
             ->method('setSortOrders')
-            ->with($expected)
+            ->with($expectedOrders)
             ->willReturn($searchCriteria);
         $searchCriteria->expects($this->once())
             ->method('setCurrentPage')
@@ -64,10 +67,16 @@ public function testResolve($orders, $expected)
         $this->searchCriteriaBuilder->expects($this->once())
             ->method('create')
             ->willReturn($searchCriteria);
-        $this->searchCriteriaBuilder->expects($this->once())
-            ->method('setPageSize')
-            ->with($size)
-            ->willReturn($this->searchCriteriaBuilder);
+
+        if ($expectedSize === null) {
+            $this->searchCriteriaBuilder->expects($this->never())
+                ->method('setPageSize');
+        } else {
+            $this->searchCriteriaBuilder->expects($this->once())
+                ->method('setPageSize')
+                ->with($expectedSize)
+                ->willReturn($this->searchCriteriaBuilder);
+        }
 
         $objectManager = new ObjectManagerHelper($this);
         /** @var SearchCriteriaResolver $model */
@@ -92,12 +101,12 @@ public function resolveSortOrderDataProvider()
     {
         return [
             [
-                null,
-                null,
+                ['size' => 0, 'orders' => null],
+                ['size' => null, 'orders' => null],
             ],
             [
-                ['test' => 'ASC'],
-                ['test' => 'ASC'],
+                ['size' => 10, 'orders' => ['test' => 'ASC']],
+                ['size' => 10, 'orders' => ['test' => 'ASC']],
             ],
         ];
     }