Merge remote-tracking branch 'origin/merchant_beta' into SUPEE-7227

magento · Nov 3, 2015 · 4034577 · 4034577
2 parents 0897100 + a3b54bd
commit 4034577
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/code/Magento/Reports/Test/Unit/Model/Resource/Order/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/Resource/Order/CollectionTest.php
@@ -255,8 +255,11 @@ public function testPrepareSummary($useAggregatedData, $mainTable, $isFilter, $g
      */
     public function testGetDateRangeFirstPart($range, $customStart, $customEnd, $expectedInterval)
     {
+        $timeZoneToReturn = date_default_timezone_get();
+        date_default_timezone_set('UTC');
         $result = $this->collection->getDateRange($range, $customStart, $customEnd);
         $interval = $result['to']->diff($result['from']);
+        date_default_timezone_set($timeZoneToReturn);
         $intervalResult = $interval->format('%y %m %d %h:%i:%s');
         $this->assertEquals($expectedInterval, $intervalResult);
     }