euromark 12 年 前
コミット
f7a3d3bc7b

+ 6 - 4
Test/Case/Controller/Component/CommonComponentTest.php

@@ -198,7 +198,7 @@ class CommonComponentTest extends CakeTestCase {
 			'password' => 123,
 			'role_id' => 1,
 		);
-		$User = ClassRegistry::init('ToolsUser');
+		$User = ClassRegistry::init('MyToolsUser');
 		$User->create();
 		$res = $User->save($user);
 		$this->assertTrue(!empty($res));
@@ -227,7 +227,7 @@ class CommonComponentTest extends CakeTestCase {
 			'password' => 123,
 			'role_id' => 1,
 		);
-		$User = ClassRegistry::init('ToolsUser');
+		$User = ClassRegistry::init('MyToolsUser');
 		$User->create();
 		$res = $User->save($user);
 		$this->assertTrue(!empty($res));
@@ -305,9 +305,11 @@ class CommonComponentTest extends CakeTestCase {
 
 /*** additional helper classes ***/
 
-class ToolsUser extends AppModel {
+class MyToolsUser extends AppModel {
 
-	public $name = 'ToolsUser';
+	public $useTable = 'tools_users';
+
+	public $name = 'MyToolsUser';
 
 	public $alias = 'User';
 

+ 1 - 1
Test/Case/Model/Behavior/PasswordableBehaviorTest.php

@@ -344,7 +344,7 @@ class PasswordableBehaviorTest extends CakeTestCase {
 			'pwd_repeat' => '123456'
 		);
 		$this->User->set($data);
-		// test whitelist setting - only "password" gets auto-added, pwd, pwd_repeat etc need to be added manually
+		// Test whitelist setting - only "password" needs to gets auto-added
 		$is = $this->User->save(null, true, array('id', 'pwd', 'pwd_repeat', 'pwd_current'));
 		$this->assertTrue(!empty($is));