Merge remote-tracking branch 'origin/MAGETWO-73039' into 2.2-develop-pr47

Author: zakdma

app/code/Magento/Ui/Model/Export/MetadataProvider.php

@@ -60,7 +60,7 @@ public function __construct(
         Filter $filter,
         TimezoneInterface $localeDate,
         ResolverInterface $localeResolver,
-        $dateFormat = 'M j, Y H:i:s A',
+        $dateFormat = 'M j, Y h:i:s A',
         array $data = []
     ) {
         $this->filter = $filter;

app/code/Magento/Ui/Test/Unit/Model/Export/MetadataProviderTest.php

@@ -3,39 +3,74 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Ui\Test\Unit\Model\Export;
 
 use Magento\Framework\Api\Search\DocumentInterface;
+use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Listing\Columns;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Ui\Model\Export\MetadataProvider;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class MetadataProviderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var MetadataProvider
      */
-    protected $model;
+    private $model;
 
     /**
      * @var Filter | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $filter;
+    private $filter;
+
+    /**
+     * @var TimezoneInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeDate;
 
+    /**
+     * @var ResolverInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeResolver;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->filter = $this->getMockBuilder(\Magento\Ui\Component\MassAction\Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->localeDate = $this->getMockBuilder(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->localeResolver = $this->getMockBuilder(\Magento\Framework\Locale\ResolverInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->localeResolver->expects($this->any())
+            ->method('getLocale')
+            ->willReturn(null);
+
         $objectManager = new ObjectManager($this);
         $this->model = $objectManager->getObject(
             \Magento\Ui\Model\Export\MetadataProvider::class,
             [
                 'filter' => $this->filter,
+                'localeDate' => $this->localeDate,
+                'localeResolver' => $this->localeResolver,
+                'data' => ['component_name' => ['field']],
             ]
         );
     }
@@ -96,11 +131,11 @@ public function testGetFields()
      * @return UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected function prepareColumns(
-        $componentName,
-        $columnName,
-        $columnLabel,
-        $columnActionsName = 'actions_name',
-        $columnActionsLabel = 'actions_label'
+        string $componentName,
+        string $columnName,
+        string $columnLabel,
+        string $columnActionsName = 'actions_name',
+        string $columnActionsLabel = 'actions_label'
     ) {
         /** @var UiComponentInterface|\PHPUnit_Framework_MockObject_MockObject $component */
         $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
@@ -163,9 +198,10 @@ protected function prepareColumns(
      * @param array $fields
      * @param array $options
      * @param array $expected
+     * @return  void
      * @dataProvider getRowDataProvider
      */
-    public function testGetRowData($key, $fields, $options, $expected)
+    public function testGetRowData(string $key, array $fields, array $options, array $expected)
     {
         /** @var DocumentInterface|\PHPUnit_Framework_MockObject_MockObject $document */
         $document = $this->getMockBuilder(\Magento\Framework\Api\Search\DocumentInterface::class)
@@ -192,7 +228,7 @@ public function testGetRowData($key, $fields, $options, $expected)
     /**
      * @return array
      */
-    public function getRowDataProvider()
+    public function getRowDataProvider(): array
     {
         return [
             [
@@ -234,9 +270,10 @@ public function getRowDataProvider()
      * @param string $filter
      * @param array $options
      * @param array $expected
+     * @return void
      * @dataProvider getOptionsDataProvider
      */
-    public function testGetOptions($filter, $options, $expected)
+    public function testGetOptions(string $filter, array $options, array $expected)
     {
         $component = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponentInterface::class)
             ->getMockForAbstractClass();
@@ -285,7 +322,7 @@ public function testGetOptions($filter, $options, $expected)
     /**
      * @return array
      */
-    public function getOptionsDataProvider()
+    public function getOptionsDataProvider(): array
     {
         return [
             [
@@ -347,4 +384,56 @@ public function getOptionsDataProvider()
             ],
         ];
     }
+
+    /**
+     * Test for convertDate function.
+     *
+     * @param string $fieldValue
+     * @param string $expected
+     * @return void
+     * @dataProvider convertDateProvider
+     * @covers \Magento\Ui\Model\Export\MetadataProvider::convertDate()
+     */
+    public function testConvertDate(string $fieldValue, string $expected)
+    {
+        $componentName = 'component_name';
+        /** @var DocumentInterface|\PHPUnit_Framework_MockObject_MockObject $document */
+        $document = $this->getMockBuilder(\Magento\Framework\DataObject::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $document->expects($this->once())
+            ->method('getData')
+            ->with('field')
+            ->willReturn($fieldValue);
+
+        $this->localeDate->expects($this->once())
+            ->method('date')
+            ->willReturn(new \DateTime($fieldValue, new \DateTimeZone('UTC')));
+
+        $document->expects($this->once())
+            ->method('setData')
+            ->with('field', $expected);
+
+        $this->model->convertDate($document, $componentName);
+    }
+
+    /**
+     * Data provider for testConvertDate.
+     *
+     * @return array
+     */
+    public function convertDateProvider(): array
+    {
+        return [
+            [
+                'fieldValue' => '@1534505233',
+                'expected' => 'Aug 17, 2018 11:27:13 AM',
+            ],
+            [
+                'fieldValue' => '@1534530000',
+                'expected' => 'Aug 17, 2018 06:20:00 PM',
+            ],
+        ];
+    }
 }