MAGETWO-58833: [Backport] Order comments history shows time of comment twice - for 2.0.x

Author: RomaKis

app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php

@@ -157,13 +157,11 @@ public function getItemCreatedAt(array $item, $dateType = 'date', $format = \Int
         if (!isset($item['created_at'])) {
             return '';
         }
-        $date = $item['created_at'] instanceof \DateTimeInterface
-            ? $item['created_at']
-            : new \DateTime($item['created_at']);
         if ('date' === $dateType) {
-            return $this->_localeDate->formatDateTime($date, $format, $format);
+            return $this->formatDate($item['created_at'], $format);
         }
-        return $this->_localeDate->formatDateTime($date, \IntlDateFormatter::NONE, $format);
+
+        return $this->formatTime($item['created_at'], $format);
     }
 
     /**

app/code/Magento/Sales/Test/Unit/Block/Adminhtml/Order/View/Tab/HistoryTest.php

@@ -30,18 +30,43 @@ class HistoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $coreRegistryMock;
 
+    /**
+     * @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $localeDateMock;
+
+    /**
+     * @var \Magento\Backend\Block\Template\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $contextMock;
+
+
     protected function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->coreRegistryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
         $this->adminHelperMock = $this->getMock('\Magento\Sales\Helper\Admin', [], [], '', false);
 
+        $this->contextMock = $this->getMockBuilder(\Magento\Backend\Block\Template\Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getLocaleDate'])
+            ->getMock();
+
+        $this->localeDateMock = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+            ->getMock();
+
+        $this->contextMock->expects($this->any())->method('getLocaleDate')->will(
+            $this->returnValue($this->localeDateMock)
+        );
+
         $this->commentsHistory = $this->objectManager->getObject(
             'Magento\Sales\Block\Adminhtml\Order\View\Tab\History',
             [
                 'adminHelper' => $this->adminHelperMock,
-                'registry' => $this->coreRegistryMock
+                'registry' => $this->coreRegistryMock,
+                'context' => $this->contextMock,
+                'localeDate' => $this->localeDateMock
             ]
         );
     }
@@ -63,4 +88,39 @@ public function testGetItemCommentIsNotSet()
         $this->adminHelperMock->expects($this->never())->method('escapeHtmlWithLinks');
         $this->assertEquals('', $this->commentsHistory->getItemComment($item));
     }
+
+    public function testGetItemCreatedAtDate()
+    {
+        $date = new \DateTime;
+        $item = ['created_at' => $date ];
+
+        $this->localeDateMock->expects($this->once())
+            ->method('formatDateTime')
+            ->with($date, \IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE)
+            ->willReturn('date');
+
+        $this->assertEquals('date', $this->commentsHistory->getItemCreatedAt($item));
+    }
+
+    public function testGetItemCreatedAtTime()
+    {
+        $date = new \DateTime;
+        $item = ['created_at' => $date ];
+
+        $this->localeDateMock->expects($this->once())
+            ->method('formatDateTime')
+            ->with($date, \IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM)
+            ->willReturn('time');
+
+        $this->assertEquals('time', $this->commentsHistory->getItemCreatedAt($item, 'time'));
+    }
+
+    public function testGetItemCreatedAtEmpty()
+    {
+        $item = ['title' => "Test" ];
+
+        $this->localeDateMock->expects($this->never())->method('formatDateTime');
+        $this->assertEquals('', $this->commentsHistory->getItemCreatedAt($item));
+        $this->assertEquals('', $this->commentsHistory->getItemCreatedAt($item, 'time'));
+    }
 }