Merge branch 'master' of github.com:nineinchnick/yii-usr

nineinchnick · Feb 20, 2015 · 7a8fe94 · 7a8fe94
2 parents 0515012 + efb5d12
commit 7a8fe94
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/models/ExampleUserLoginAttempt.php b/models/ExampleUserLoginAttempt.php
@@ -97,13 +97,13 @@ public static function hasTooManyFailedAttempts($username, $count_limit = 5, $ti
     {
         $since = new DateTime;
         $since->sub(new DateInterval("PT{$time_limit}S"));
-        $subquery = self::model()->dbConnection->createCommand()
+        $subquery = UserLoginAttempt::model()->dbConnection->createCommand()
             ->select('is_successful')
-            ->from(self::model()->tableName())
+            ->from(UserLoginAttempt::model()->tableName())
             ->where('username = :username AND performed_on > :since')
             ->order('performed_on DESC')
             ->limit($count_limit)->getText();
-        return $count_limit <= (int)self::model()->dbConnection->createCommand()
+        return $count_limit <= (int)UserLoginAttempt::model()->dbConnection->createCommand()
             ->select('COUNT(NOT is_successful OR NULL)')
             ->from("({$subquery}) AS t")
             ->queryScalar(array(':username'=>$username, ':since' => $since->format('Y-m-d H:i:s')));

diff --git a/tests/UserLoginAttempt.php b/tests/UserLoginAttempt.php
@@ -0,0 +1,11 @@
+<?php
+
+Yii::import('vendors.nineinchnick.yii-usr.models.ExampleUserLoginAttempt');
+
+class UserLoginAttempt extends ExampleUserLoginAttempt
+{
+	public static function model($className=__CLASS__)
+	{
+		return parent::model($className);
+	}
+}
diff --git a/tests/config.php b/tests/config.php
@@ -10,8 +10,19 @@
 		'usr'=>array(
 			'class'=>'vendors.nineinchnick.yii-usr.UsrModule',
 			'userIdentityClass' => 'UserIdentity',
-			'oneTimePasswordMode' => 'time',
 			'captcha' => array('clickableImage'=>true,'showRefreshButton'=>false),
+            'loginFormBehaviors' => array(
+                'expiredPasswordBehavior' => array(
+                    'class' => 'ExpiredPasswordBehavior',
+                    'passwordTimeout' => 10,
+                ),
+                'oneTimePasswordBehavior' => array(
+                    'class' => 'OneTimePasswordFormBehavior',
+                    'mode' => 'time', // cannot use OneTimePasswordFormBehavior::OTP_TIME here as it hasn't been loaded yet
+                    'required' => true,
+                    'timeout' => 123,
+                ),
+            ),
 		),
 	),
 	'components'=>array(

diff --git a/tests/unit/BehaviorsTest.php b/tests/unit/BehaviorsTest.php
@@ -48,13 +48,13 @@ public function testOTP()
 		$this->assertEquals(array('oneTimePassword'), $otp->attributeNames());
 		$this->assertEquals(array('oneTimePassword'), $otp->attributeNames());
 		$this->assertEquals(array('oneTimePassword' => Yii::t('UsrModule.usr','One Time Password')), $otp->attributeLabels());
-		$rules = $otp->rules();
+		$rules = $otp->filterRules();
 
 		$ruleOptions = array('on'=>'reset');
 		$otp->setRuleOptions($ruleOptions);
 		$this->assertEquals($ruleOptions, $otp->getRuleOptions());
 
-		$modifiedRules = $otp->rules();
+		$modifiedRules = $otp->filterRules();
 		foreach($modifiedRules as $rule) {
 			foreach($ruleOptions as $key=>$value) {
 				$this->assertEquals($value, $rule[$key]);
@@ -94,7 +94,7 @@ public function testCaptcha()
 
 		$this->assertEquals(array('verifyCode'), $captcha->attributeNames());
 		$this->assertEquals(array('verifyCode' => Yii::t('UsrModule.usr','Verification code')), $captcha->attributeLabels());
-		$this->assertEquals(array(array('verifyCode', 'captcha', 'captchaAction' => 'usr/default/captcha')), $captcha->rules());
+		$this->assertEquals(array(array('verifyCode', 'captcha', 'captchaAction' => 'usr/default/captcha')), $captcha->filterRules());
 	}
 
 	public function testExpiredPassword()

diff --git a/tests/unit/LoginFormTest.php b/tests/unit/LoginFormTest.php
@@ -2,6 +2,7 @@
 
 Yii::import('vendors.nineinchnick.yii-usr.tests.User');
 Yii::import('vendors.nineinchnick.yii-usr.tests.UserIdentity');
+Yii::import('vendors.nineinchnick.yii-usr.tests.UserLoginAttempt');
 Yii::import('vendors.nineinchnick.yii-usr.models.BaseUsrForm');
 Yii::import('vendors.nineinchnick.yii-usr.models.LoginForm');
 

diff --git a/tests/unit/ModuleTest.php b/tests/unit/ModuleTest.php
@@ -14,7 +14,12 @@ class ModuleTest extends CTestCase
 	public function testCreateForm()
 	{
 		$module = new UsrModule('usr',Yii::app());
-		$module->passwordTimeout = 300;
+        $module->loginFormBehaviors = array(
+            'expiredPasswordBehavior' => array(
+                'class' => 'ExpiredPasswordBehavior',
+                'passwordTimeout' => 300,
+            ),
+        );
 		$form = $module->createFormModel('LoginForm');
 		$this->assertTrue($form->asa('expiredPasswordBehavior') instanceof ExpiredPasswordBehavior);
 	}