Move App::uses(), rename helper class to avoid conflict

cakephp · Nov 22, 2014 · d7b353d · d7b353d
1 parent 43413f0
commit d7b353d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php b/lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php
@@ -20,6 +20,7 @@
 App::uses('AuthComponent', 'Controller/Component');
 App::uses('AclComponent', 'Controller/Component');
 App::uses('FormAuthenticate', 'Controller/Component/Auth');
+App::uses('CakeEvent', 'Event');
 
 /**
  * TestAuthComponent class
@@ -271,7 +272,7 @@ public function redirect($url, $status = null, $exit = true) {
  *
  * @package Cake.Test.Case.Event
  */
-class CakeEventTestListener {
+class AuthEventTestListener {
 
 	public $callStack = array();
 
@@ -426,9 +427,8 @@ public function testLogin() {
 			->method('renew');
 
 		$manager = $this->Controller->getEventManager();
-		$listener = $this->getMock('CakeEventTestListener');
+		$listener = $this->getMock('AuthEventTestListener');
 		$manager->attach(array($listener, 'listenerFunction'), 'Auth.afterIdentify');
-		App::uses('CakeEvent', 'Event');
 		$event = new CakeEvent('Auth.afterIdentify', $this->Auth, array('user' => $user));
 		$listener->expects($this->once())->method('listenerFunction')->with($event);