Merge remote-tracking branch 'tango/MAGETWO-94206' into PR-2008-2.3-tmp

Author: dhorytskyi

app/code/Magento/ImportExport/Helper/Report.php

@@ -52,9 +52,9 @@ public function __construct(
      */
     public function getExecutionTime($time)
     {
-        $reportTime = $this->timeZone->date($time, $this->timeZone->getConfigTimezone());
+        $reportTime = $this->timeZone->date($time);
         $timeDiff = $reportTime->diff($this->timeZone->date());
-        return $timeDiff->format('%H:%M:%S');
+        return $timeDiff->format('%H:%I:%S');
     }
 
     /**

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -89,12 +89,17 @@ protected function setUp()
      */
     public function testGetExecutionTime()
     {
-        $time = '01:02:03';
-        $this->timezone->expects($this->any())->method('date')->willReturnSelf();
-        $this->timezone->expects($this->any())->method('getConfigTimezone')->willReturn('America/Los_Angeles');
-        $this->timezone->expects($this->any())->method('diff')->willReturnSelf();
-        $this->timezone->expects($this->any())->method('format')->willReturn($time);
-        $this->assertEquals($time, $this->report->getExecutionTime($time));
+        $startDate = '2000-01-01 01:01:01';
+        $endDate = '2000-01-01 02:03:04';
+        $executionTime = '01:02:03';
+
+        $startDateMock = $this->createTestProxy(\DateTime::class, ['time' => $startDate]);
+        $endDateMock = $this->createTestProxy(\DateTime::class, ['time' => $endDate]);
+        $this->timezone->method('date')
+            ->withConsecutive([$startDate], [])
+            ->willReturnOnConsecutiveCalls($startDateMock, $endDateMock);
+
+        $this->assertEquals($executionTime, $this->report->getExecutionTime($startDate));
     }
 
     /**
@@ -159,6 +164,9 @@ public function testImportFileExistsException($fileName)
         $this->report->importFileExists($fileName);
     }
 
+    /**
+     * Test importFileExists()
+     */
     public function testImportFileExists()
     {
         $this->assertEquals($this->report->importFileExists('..file..name'), true);