Fix tests

src/View/Helper/NumberHelper.php

@@ -4,10 +4,9 @@ namespace Tools\View\Helper;
 
 use Cake\View\Helper\NumberHelper as CakeNumberHelper;
 use Cake\Utility\Hash;
+
 /**
- * Todo: rename to MyNumberHelper some day?
- * Aliasing it then as Number again in the project
- *
+ * Ovewrite to allow usage of own Number class.
  */
 class NumberHelper extends CakeNumberHelper {
 

tests/TestCase/Utility/TimeTest.php

@@ -306,11 +306,17 @@ class TimeTest extends TestCase {
 	 * @return void
 	 */
 	public function testIsLeapYear() {
-		$is = $this->Time->isLeapYear('2000');
+		$this->Time = new Time('2001-01-01');
+		$is = $this->Time->isLeapYear();
+		$this->assertFalse($is);
+
+		$this->Time = new Time('2008-01-01');
+		$is = $this->Time->isLeapYear();
 		$this->assertTrue($is);
 
-		$is = $this->Time->isLeapYear('2001');
-		$this->assertFalse($is);
+		$this->Time = new Time('2000-01-01');
+		$is = $this->Time->isLeapYear();
+		$this->assertTrue($is);
 	}
 
 	/**
@@ -556,11 +562,11 @@ class TimeTest extends TestCase {
 		$res = $this->Time->relLengthOfTime(date(FORMAT_DB_DATETIME, time() - 4 * DAY - 5 * HOUR), null, array('plural' => 'n'));
 		//pr($res);
 		//$this->assertEquals($res, 'Vor 4 Tagen, 5 '.__d('tools', 'Hours'));
-		$this->assertEquals(__d('tools', '%s ago', '4 ' . __d('tools', 'Days') . ', ' . '5 ' . __d('tools', 'Hours')), $res);
+		$this->assertEquals(__d('tools', '{0} ago', '4 ' . __d('tools', 'Days') . ', ' . '5 ' . __d('tools', 'Hours')), $res);
 
 		$res = $this->Time->relLengthOfTime(date(FORMAT_DB_DATETIME, time() + 4 * DAY + 5 * HOUR), null, array('plural' => 'n'));
 		//pr($res);
-		$this->assertEquals(__d('tools', 'In %s', '4 ' . __d('tools', 'Days') . ', ' . '5 ' . __d('tools', 'Hours')), $res);
+		$this->assertEquals(__d('tools', 'In {0}', '4 ' . __d('tools', 'Days') . ', ' . '5 ' . __d('tools', 'Hours')), $res);
 
 		$res = $this->Time->relLengthOfTime(date(FORMAT_DB_DATETIME, time()), null, array('plural' => 'n'));
 		//pr($res);

tests/bootstrap.php

@@ -13,6 +13,8 @@ define('CAKE', CORE_PATH . APP_DIR . DS);
 define('WWW_ROOT', ROOT . DS . 'webroot' . DS);
 define('CONFIG', dirname(__FILE__) . DS . 'config' . DS);
 
+ini_set('intl.default_locale', 'de-DE');
+
 require ROOT . '/vendor/cakephp/cakephp/src/basics.php';
 require ROOT . '/vendor/autoload.php';
 
@@ -28,7 +30,13 @@ Cake\Core\Configure::write('App', [
 		'encoding' => 'UTF-8']);
 Cake\Core\Configure::write('debug', true);
 
-Cake\Network\Email\Email::config('defualt', array('transport' => 'Debug'));
+Cake\Core\Configure::write('Config', [
+		'adminEmail' => 'test@example.com',
+		'adminName' => 'Mark']);
+Cake\Network\Email\Email::config('default', array('transport' => 'Debug'));
+Cake\Network\Email\Email::configTransport('Debug', [
+		'className' => 'Debug'
+]);
 
 mb_internal_encoding('UTF-8');
 
@@ -59,7 +67,7 @@ $cache = [
 
 Cake\Cache\Cache::config($cache);
 
-Cake\Core\Plugin::load('Tools', ['path' => './', 'bootstrap' => true]);
+Cake\Core\Plugin::load('Tools', ['path' => ROOT . DS, 'bootstrap' => true]);
 
 // Ensure default test connection is defined
 if (!getenv('db_class')) {