Merge branch 'MAGETWO-44815' into bugfixes

Author: Dmytro Voskoboinikov

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

@@ -251,9 +251,11 @@ public function testPrepareSummary($useAggregatedData, $mainTable, $isFilter, $g
      */
     public function testGetDateRangeFirstPart($range, $customStart, $customEnd, $expectedInterval)
     {
-        $this->markTestIncomplete('MAGETWO-44815');
+        $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);
     }

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php

@@ -51,8 +51,6 @@ public function setValidationFilterDataProvider()
     }
 
     /**
-     * Test checks timezone when timezone is not changed
-     *
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/SalesRule/_files/rule_specific_date.php
@@ -70,24 +68,20 @@ public function testMultiRulesWithTimezone()
     }
 
     /**
-     * Test checks timezone when timezone is shifted to locale where current day already +1
-     * (e.g. existed rule: from day 2000-01-01 to day 2000-01-01, after changing timezone 2000-01-02)
-     *
      * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
      * @magentoDataFixture Magento/SalesRule/_files/rule_specific_date.php
      * @magentoConfigFixture general/locale/timezone Australia/Sydney
      */
     public function testMultiRulesWithDifferentTimezone()
     {
-        $this->markTestIncomplete('MAGETWO-44815');
         $this->setSpecificTimezone('Australia/Sydney');
         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             'Magento\SalesRule\Model\ResourceModel\Rule\Collection'
         );
         $collection->addWebsiteGroupDateFilter(1, 0);
         $items = array_values($collection->getItems());
-        $this->assertEmpty($items);
+        $this->assertNotEmpty($items);
     }
 
     protected function setSpecificTimezone($timezone)

dev/tests/integration/testsuite/Magento/SalesRule/_files/rule_specific_date.php

@@ -5,6 +5,9 @@
  */
 
 /** @var \Magento\SalesRule\Model\Rule $rule */
+$tomorrow = new \DateTime();
+$tomorrow->add(\DateInterval::createFromDateString('+1 day'));
+
 $rule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
 $rule->setName(
     '#1'
@@ -25,5 +28,5 @@
 )->setFromDate(
     date('Y-m-d')
 )->setToDate(
-    date('Y-m-d')
+    $tomorrow->format('Y-m-d')
 )->save();