Merge pull request #2 from Xety/fix-testcases

Fixed testcases
Xety · Mar 17, 2015 · 7eee47d · 7eee47d
2 parents 09e4608 + 230edc0
commit 7eee47d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/TestCase/Auth/CookieAuthenticateTest.php b/tests/TestCase/Auth/CookieAuthenticateTest.php
@@ -38,7 +38,6 @@ public function setUp() {
 		Security::salt('Xety-Cake3CookieAuth_Xety-Cake3CookieAuth');
 		$this->registry = new ComponentRegistry(new Controller($this->request, $this->response));
 		$this->registry->load('Cookie');
-		$this->registry->load('Session');
 		$this->registry->load('Auth');
 		$this->auth = new CookieAuthenticate($this->registry);
 
@@ -118,7 +117,7 @@ public function testAuthenticateNoCookieComponent() {
 		$this->_registry->load('Cookie');
 		$this->_auth = new CookieAuthenticate($this->_registry);
 
-		$this->assertTrue($this->_registry->loaded('Cookie'));
+		$this->assertTrue($this->_registry->has('Cookie'));
 
 		$this->_registry->unload('Cookie');
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -8,7 +8,9 @@
 require_once 'vendor/autoload.php';
 
 // Path constants to a few helpful things.
-define('DS', DIRECTORY_SEPARATOR);
+if (!defined('DS')) {
+	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);