Making tests more robust to timezone differences

cakephp · Jan 15, 2014 · ae2127e · ae2127e
1 parent 5cdd8ac
commit ae2127e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Test/TestCase/Database/QueryTest.php b/Test/TestCase/Database/QueryTest.php
@@ -1923,6 +1923,7 @@ function($q) {
 		$result = $query
 			->select(['d' => $query->func()->now('time')])
 			->execute();
+
 		$this->assertWithinMargin(
 			date('U'),
 			(new \DateTime($result->fetchAll('assoc')[0]['d']))->format('U'),

diff --git a/Test/init.php b/Test/init.php
@@ -59,6 +59,7 @@
 
 require CORE_PATH . 'Cake/bootstrap.php';
 
+date_default_timezone_set('UTC');
 mb_internal_encoding('UTF-8');
 
 Configure::write('debug', 2);
@@ -98,7 +99,8 @@
 	'dsn' => getenv('db_dsn'),
 	'database' => getenv('db_database'),
 	'login' => getenv('db_login'),
-	'password' => getenv('db_password')
+	'password' => getenv('db_password'),
+	'timezone' => 'UTC'
 ]);
 
 Configure::write('Session', [