Merge branch 'MAGETWO-91520' into 2.3-develop-pr8

Author: serhii-balko

app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php

@@ -37,6 +37,8 @@ public function __construct(
     }
 
     /**
+     * Grid constructor
+     *
      * @return void
      */
     protected function _construct()
@@ -46,6 +48,8 @@ protected function _construct()
     }
 
     /**
+     * Prepare collection
+     *
      * @return \Magento\Backend\Block\Widget\Grid
      */
     protected function _prepareCollection()
@@ -67,11 +71,16 @@ protected function _prepareCollection()
 
         $this->setCollection($collection);
         parent::_prepareCollection();
+        if ($this->_isExport) {
+            $collection->setPageSize(null);
+        }
         $this->getCollection()->resolveCustomerNames();
         return $this;
     }
 
     /**
+     * Add column filter to collection
+     *
      * @param array $column
      *
      * @return $this
@@ -90,6 +99,8 @@ protected function _addColumnFilterToCollection($column)
     }
 
     /**
+     * Prepare columns
+     *
      * @return \Magento\Backend\Block\Widget\Grid\Extended
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -223,6 +234,8 @@ protected function _prepareColumns()
     }
 
     /**
+     * Get rows url
+     *
      * @param \Magento\Framework\DataObject $row
      *
      * @return string

dev/tests/integration/testsuite/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/GridTest.php

@@ -3,10 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Reports\Block\Adminhtml\Shopcart\Abandoned;
 
 use Magento\Quote\Model\Quote;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\View\LayoutInterface;
 
 /**
  * Test class for \Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid
@@ -20,12 +23,12 @@ class GridTest extends \Magento\Reports\Block\Adminhtml\Shopcart\GridTestAbstrac
     /**
      * @return void
      */
-    public function testGridContent()
+    public function testGridContent(): void
     {
-        /** @var \Magento\Framework\View\LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(\Magento\Framework\View\LayoutInterface::class);
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
         /** @var Grid $grid */
-        $grid = $layout->createBlock(\Magento\Reports\Block\Adminhtml\Shopcart\Abandoned\Grid::class);
+        $grid = $layout->createBlock(Grid::class);
         $grid->getRequest()->setParams(['filter' => base64_encode(urlencode('email=customer@example.com'))]);
         $result = $grid->getPreparedCollection();
 
@@ -35,4 +38,17 @@ public function testGridContent()
         $this->assertEquals('customer@example.com', $quote->getCustomerEmail());
         $this->assertEquals(10.00, $quote->getSubtotal());
     }
+
+    /**
+     * @return void
+     */
+    public function testPageSizeIsSetToNullWhenExportCsvFile(): void
+    {
+        /** @var LayoutInterface $layout */
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        /** @var Grid $grid */
+        $grid = $layout->createBlock(Grid::class);
+        $grid->getCsvFile();
+        $this->assertNull($grid->getCollection()->getPageSize());
+    }
 }