Merge pull request #41 from bravo-kernel/travis

Travis fixes
FriendsOfCake · Apr 8, 2015 · 35c1d29 · 35c1d29
2 parents 14ea5f3 + e0100c7
commit 35c1d29
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/tests/TestCase/Auth/MultiColumnAuthenticateTest.php b/tests/TestCase/Auth/MultiColumnAuthenticateTest.php
@@ -3,12 +3,12 @@
 
 use Cake\Controller\Component\AuthComponent;
 use Cake\Datasource\ConnectionManager;
+use Cake\I18n\Time;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\ORM\Table;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Time;
 use FOC\Authenticate\Auth\MultiColumnAuthenticate;
 
 /**

diff --git a/tests/TestCase/Auth/TokenAuthenticateTest.php b/tests/TestCase/Auth/TokenAuthenticateTest.php
@@ -3,11 +3,11 @@
 
 use Cake\Controller\Component\AuthComponent;
 use Cake\Controller\Controller;
+use Cake\I18n\Time;
 use Cake\Network\Request;
 use Cake\Network\Response;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
-use Cake\Utility\Time;
 use FOC\Authenticate\Auth\TokenAuthenticate;
 
 /**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -9,7 +9,6 @@
 require_once 'vendor/autoload.php';
 
 // Path constants to a few helpful things.
-define('DS', DIRECTORY_SEPARATOR);
 define('ROOT', dirname(__DIR__) . DS);
 define('CAKE_CORE_INCLUDE_PATH', ROOT . 'vendor' . DS . 'cakephp' . DS . 'cakephp');
 define('CORE_PATH', ROOT . 'vendor' . DS . 'cakephp' . DS . 'cakephp' . DS);