add user required fields

ivolovikov · Oct 16, 2012 · 21b5587 · 21b5587
1 parent e91331c
commit 21b5587
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/demo/controllers/RestUserController.php b/demo/controllers/RestUserController.php
@@ -47,7 +47,7 @@ public function actionView()
 
     public function actionCreate()
     {
-        $model = new RestUser();
+        $model = new RestUser('create');
 
         if ($this->isPost() && ($data = $_POST)) {
             $model->attributes = $data;

diff --git a/demo/models/RestUser.php b/demo/models/RestUser.php
@@ -20,11 +20,14 @@ class RestUser extends CModel
 
     public $name = 'Test REST User';
 
-    public $password = 'hidden_password';
+    public $password;
 
-    public function __construct()
+    public function __construct($scenario = null)
 	{
-		$this->attachBehaviors($this->behaviors());
+		if ($scenario !== null) {
+            $this->scenario = $scenario;
+        }
+        $this->attachBehaviors($this->behaviors());
 	}
 
     /**
@@ -41,6 +44,7 @@ public function attributeNames()
     public function rules()
     {
         return array(
+            array('email, password', 'required', 'on' => 'create'),
             array('email', 'email'),
             array('name, password', 'length', 'max' => 244),
 

diff --git a/tests/restTest/RestUserTest.php b/tests/restTest/RestUserTest.php
@@ -14,11 +14,15 @@ class RestUserTest extends AbstractTest
 {
     public function testCreate()
     {
-        $result = $this->post('/api/users', array('email' => '[email protected]'));
+        $result = $this->post('/api/users', array(
+            'email' => '[email protected]',
+            'password' => 'hidden_password',
+        ));
         $model = json_decode($result['body']);
 
         $this->assertEquals($model->id, 'TEST_ID');
         $this->assertEquals($model->email, '[email protected]');
+        $this->assertFalse(isset($model->password));
 
         $this->assertEquals($result['code'], 201);