Skip to content

Commit 4034577

Browse files
author
Sergey Nosov
committed
Merge remote-tracking branch 'origin/merchant_beta' into SUPEE-7227
2 parents 0897100 + a3b54bd commit 4034577

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

app/code/Magento/Reports/Test/Unit/Model/Resource/Order/CollectionTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,11 @@ public function testPrepareSummary($useAggregatedData, $mainTable, $isFilter, $g
255255
*/
256256
public function testGetDateRangeFirstPart($range, $customStart, $customEnd, $expectedInterval)
257257
{
258+
$timeZoneToReturn = date_default_timezone_get();
259+
date_default_timezone_set('UTC');
258260
$result = $this->collection->getDateRange($range, $customStart, $customEnd);
259261
$interval = $result['to']->diff($result['from']);
262+
date_default_timezone_set($timeZoneToReturn);
260263
$intervalResult = $interval->format('%y %m %d %h:%i:%s');
261264
$this->assertEquals($expectedInterval, $intervalResult);
262265
}

0 commit comments

Comments
 (0)