Browse Source

updated CHANGES.md, Config/Aauth, UserModelTest & UserTest

v3-dev
REJack 6 years ago
parent
commit
8ef2c2adf7
No known key found for this signature in database
GPG Key ID: 4A44B48700429F46
  1. 2
      CHANGES.md
  2. 5
      application/Config/Aauth.php
  3. 15
      tests/Aauth/Database/UserModelTest.php
  4. 2
      tests/Aauth/Libraries/Aauth/UserTest.php

2
CHANGES.md

@ -43,7 +43,7 @@
- verification_link => linkVerification - verification_link => linkVerification
- totp_two_step_login_redirect => linkTotp - totp_two_step_login_redirect => linkTotp
- verification => userVerification - verification => userVerification
- additional_valid_chars => userAdditionalChars - additional_valid_chars => userRegexPattern
- min => passwordMin - min => passwordMin
- max => passwordMax - max => passwordMax
- password_hash_algo => passwordHashAlgo - password_hash_algo => passwordHashAlgo

5
application/Config/Aauth.php

@ -70,9 +70,8 @@ class Aauth extends BaseConfig
| |
| 'userRegexPattern' | 'userRegexPattern'
| |
| Additional valid chars for username. Non alphanumeric characters that are | Regex pattern for valid chars for username
| allowed by default | (default: '^[a-zA-Z0-9]{3,}$')
| (default: '[a-zA-Z0-9]+')
*/ */
public $userVerification = false; public $userVerification = false;
public $userRegexPattern = '^[a-zA-Z0-9]{3,}$'; public $userRegexPattern = '^[a-zA-Z0-9]{3,}$';

15
tests/Aauth/Database/UserModelTest.php

@ -95,9 +95,22 @@ class UserModelTest extends CIDatabaseTestCase
public function testUpdate() public function testUpdate()
{ {
$this->assertFalse($this->model->update(2, ['id' => 2, 'email' => 'admin@example.com'])); $this->assertFalse($this->model->update(2, ['email' => 'admin@example.com']));
print_r($this->model->errors());
$this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->model->errors()[0]); $this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->model->errors()[0]);
// $this->assertFalse($this->model->update(2, ['email' => 'adminexample.com']));
// $this->assertEquals(lang('Aauth.invalidEmail'), $this->model->errors()[0]);
// $this->assertFalse($this->model->update(2, ['password' => 'pass']));
// $this->assertEquals(lang('Aauth.invalidPassword'), $this->model->errors()[0]);
// $this->assertFalse($this->model->update(2, ['password' => 'password12345678901011121314151617']));
// $this->assertEquals(lang('Aauth.invalidPassword'), $this->model->errors()[0]);
// $this->assertFalse($this->model->update(2, ['password' => 'password12345678901011121314151617']));
// $this->assertEquals(lang('Aauth.invalidPassword'), $this->model->errors()[0]);
// $this->assertFalse($this->library->updateUser(2, 'admin@example.com', null, null)); // $this->assertFalse($this->library->updateUser(2, 'admin@example.com', null, null));
// $this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]); // $this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]);

2
tests/Aauth/Libraries/Aauth/UserTest.php

@ -78,7 +78,7 @@ class UserTest extends CIDatabaseTestCase
]); ]);
$this->assertEquals(lang('Aauth.infoUpdateSuccess'), $this->library->getInfosArray()[0]); $this->assertEquals(lang('Aauth.infoUpdateSuccess'), $this->library->getInfosArray()[0]);
// moved to UserModelTest // moved to UserModelTest, not working here :/
// $this->assertFalse($this->library->updateUser(2, 'admin@example.com', null, null)); // $this->assertFalse($this->library->updateUser(2, 'admin@example.com', null, null));
// $this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]); // $this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]);

Loading…
Cancel
Save