From 2f513bcdd47f43390e483968244d8f61b2bcb78d Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Tue, 22 Aug 2017 13:44:58 +0300 Subject: [PATCH] Bug fix, prevent displaying `0000-00-00 00:00:00` as anything else in admin grids #10598 - Unit test added --- .../Test/Unit/Component/Listing/Columns/DateTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php index 0bfb2a7dc0f34..045f11fe688f4 100644 --- a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php +++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/DateTest.php @@ -89,4 +89,14 @@ public function testPrepareDataSource() $result = $this->model->prepareDataSource(['data' => ['items' => [$item]]]); $this->assertEquals(self::TEST_TIME, $result['data']['items'][0]['field_name']); } + + public function testPrepareDataSourceWithZeroDate() + { + $zeroDate = '0000-00-00 00:00:00'; + $item = ['test_data' => 'some_data', 'field_name' => $zeroDate]; + $this->timezoneMock->expects($this->never())->method('date'); + + $result = $this->model->prepareDataSource(['data' => ['items' => [$item]]]); + $this->assertEquals($zeroDate, $result['data']['items'][0]['field_name']); + } }