Skip to content

Commit c0bad72

Browse files
committed
MAGETWO-35040: Sales Report with Empty Rows does not work
1 parent 2bc3abe commit c0bad72

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportIntervalResult.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function processAssert(
3434
$this->order = $order;
3535
$this->searchInSalesReportGrid($salesReport);
3636
$salesResult = $this->prepareSalesResult($salesReportPage->getGridBlock()->getLastResult());
37-
$prepareInitialResult = $this->prepareExpectedResult($initialSalesResult);
37+
$prepareInitialResult = $this->prepareSalesResult($this->prepareExpectedResult($initialSalesResult));
3838
\PHPUnit_Framework_Assert::assertEquals(
3939
$prepareInitialResult,
4040
$salesResult,
@@ -52,7 +52,7 @@ protected function prepareSalesResult($salesResult)
5252
{
5353
$data = [];
5454
foreach ($salesResult as $key => $result) {
55-
$data[$key] = intval($result);
55+
$data[$key] = floatval($result);
5656
}
5757

5858
return $data;

dev/tests/functional/tests/app/Magento/Reports/Test/Constraint/AssertSalesReportTotalResult.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,31 @@ public function processAssert(
3333
$this->salesReportPage = $salesReportPage;
3434
$this->order = $order;
3535
$this->searchInSalesReportGrid($salesReport);
36-
$salesResult = $salesReportPage->getGridBlock()->getTotalResult();
37-
$prepareInitialResult = $this->prepareExpectedResult($initialSalesTotalResult);
36+
$salesResult = $this->prepareSalesResult($salesReportPage->getGridBlock()->getTotalResult());
37+
$prepareInitialResult = $this->prepareSalesResult($this->prepareExpectedResult($initialSalesTotalResult));
3838
\PHPUnit_Framework_Assert::assertEquals(
3939
$prepareInitialResult,
4040
$salesResult,
4141
"Grand total Sales result is not correct."
4242
);
4343
}
4444

45+
/**
46+
* Prepare sales result.
47+
*
48+
* @param array $salesResult
49+
* @return array
50+
*/
51+
protected function prepareSalesResult($salesResult)
52+
{
53+
$data = [];
54+
foreach ($salesResult as $key => $result) {
55+
$data[$key] = floatval($result);
56+
}
57+
58+
return $data;
59+
}
60+
4561
/**
4662
* Returns a string representation of the object
4763
*

0 commit comments

Comments
 (0)