From eb58b6c537e8d4659783f0d00dfd6c1bf006282d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 05 May 2015 06:40:17 -0400
Subject: [PATCH] Fix failing rcube_utils::strtotime() test if system timezone was different than expected
---
tests/Framework/Utils.php | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
index f7389f0..88cc70a 100644
--- a/tests/Framework/Utils.php
+++ b/tests/Framework/Utils.php
@@ -275,18 +275,21 @@
*/
function test_strtotime()
{
+ // this test depends on system timezone if not set
+ date_default_timezone_set('UTC');
+
$test = array(
'1' => 1,
'' => 0,
'abc-555' => 0,
- '2013-04-22' => 1366581600,
- '2013/04/22' => 1366581600,
- '2013.04.22' => 1366581600,
- '22-04-2013' => 1366581600,
- '22/04/2013' => 1366581600,
- '22.04.2013' => 1366581600,
- '22.4.2013' => 1366581600,
- '20130422' => 1366581600,
+ '2013-04-22' => 1366588800,
+ '2013/04/22' => 1366588800,
+ '2013.04.22' => 1366588800,
+ '22-04-2013' => 1366588800,
+ '22/04/2013' => 1366588800,
+ '22.04.2013' => 1366588800,
+ '22.4.2013' => 1366588800,
+ '20130422' => 1366588800,
'2013/06/21 12:00:00 UTC' => 1371816000,
'2013/06/21 12:00:00 Europe/Berlin' => 1371808800,
);
--
Gitblit v1.9.1