From 1d7b54ae39eda5d64dbed4854d37ae8154de0dd2 Mon Sep 17 00:00:00 2001 From: Vinai Kopp Date: Mon, 5 Jan 2015 18:09:15 +0100 Subject: [PATCH] Specify date fixture and fix expectations * Fix date_format expectation for month part * Make test independent of current time --- .../Framework/Data/Form/Element/DateTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php index 65ed2f489ee24..53ab713ea4531 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Form/Element/DateTest.php @@ -48,29 +48,29 @@ public function testGetValue(array $data, $expect) */ public function getValueDataProvider() { - $currentTime = time(); + $testTimestamp = strtotime('2014-05-18 12:08:16'); return [ [ [ 'date_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT, 'time_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT, - 'value' => $currentTime, + 'value' => $testTimestamp, ], - date('m/j/y g:i A', $currentTime), + date('n/j/y g:i A', $testTimestamp), ], [ [ 'time_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT, - 'value' => $currentTime, + 'value' => $testTimestamp, ], - date('g:i A', $currentTime) + date('g:i A', $testTimestamp) ], [ [ 'date_format' => \Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT, - 'value' => $currentTime, + 'value' => $testTimestamp, ], - date('m/j/y', $currentTime) + date('n/j/y', $testTimestamp) ] ]; }