Updating CrudAuthorize to work like ActionsAuthorize.

Updating tests. Fixes #1749
cakephp · Sep 27, 2011 · a5fe702 · a5fe702
1 parent 2a55423
commit a5fe702
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/Cake/Controller/Component/Auth/CrudAuthorize.php b/lib/Cake/Controller/Component/Auth/CrudAuthorize.php
@@ -90,11 +90,12 @@ public function authorize($user, CakeRequest $request) {
 			);
 			return false;
 		}
+		$user = array($this->settings['userModel'] => $user);
 		$Acl = $this->_Collection->load('Acl');
 		return $Acl->check(
 			$user,
 			$this->action($request, ':controller'),
 			$this->settings['actionMap'][$request->params['action']]
 		);
 	}
-}
+}
diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/CrudAuthorizeTest.php
@@ -86,7 +86,7 @@ public function testAuthorizeCheckSuccess() {
 			->with($user, 'Posts', 'read')
 			->will($this->returnValue(true));
 
-		$this->assertTrue($this->auth->authorize($user, $request));
+		$this->assertTrue($this->auth->authorize($user['User'], $request));
 	}
 
 /**
@@ -108,7 +108,7 @@ public function testAuthorizeCheckFailure() {
 			->with($user, 'Posts', 'read')
 			->will($this->returnValue(false));
 
-		$this->assertFalse($this->auth->authorize($user, $request));
+		$this->assertFalse($this->auth->authorize($user['User'], $request));
 	}