Skip to content

Commit c7f00eb

Browse files
committed
ACP2E-3735: Incorrect filtered Data in Product Export for Multi-Store Setup
- fixed unit test
1 parent ee14c60 commit c7f00eb

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ public function export()
10081008
$this->paginateCollection($page, $this->getItemsPerPage());
10091009

10101010
$exportData = $this->getExportData();
1011-
if (count($exportData) == 0) {
1011+
if ($exportData == null || count($exportData) == 0) {
10121012
break;
10131013
}
10141014
if ($page == 1) {

app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,6 @@ public function testExportCountZeroBreakInternalCalls()
343343
$this->product->expects($this->once())->method('paginateCollection')->with($page, $itemsPerPage);
344344
$this->abstractCollection->expects($this->once())->method('setOrder')->with('entity_id', 'asc');
345345

346-
$this->abstractCollection->expects($this->once())->method('count')->willReturn(0);
347-
348346
$this->abstractCollection->expects($this->never())->method('getCurPage');
349347
$this->abstractCollection->expects($this->never())->method('getLastPageNumber');
350348
$this->product->expects($this->never())->method('_getHeaderColumns');

0 commit comments

Comments
 (0)