Skip to content

Commit a5f440e

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

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,9 @@ public function export()
10081008
$this->paginateCollection($page, $this->getItemsPerPage());
10091009

10101010
$exportData = $this->getExportData();
1011+
if (count($exportData) == 0) {
1012+
break;
1013+
}
10111014
if ($page == 1) {
10121015
$writer->setHeaderCols($this->_getHeaderColumns());
10131016
}

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

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

376-
$this->abstractCollection->expects($this->once())->method('count')->willReturn(1);
377-
378376
$this->abstractCollection->expects($this->once())->method('getCurPage')->willReturn($curPage);
379377
$this->abstractCollection->expects($this->once())->method('getLastPageNumber')->willReturn($lastPage);
380378
$headers = ['headers'];

0 commit comments

Comments
 (0)