Browse Source

updated UserModel, InfosTest & UserTest

v3-dev
REJack 6 years ago
parent
commit
aeb92737ca
No known key found for this signature in database
GPG Key ID: 4A44B48700429F46
  1. 3
      application/Models/Aauth/UserModel.php
  2. 2
      tests/Aauth/Libraries/Aauth/InfosTest.php
  3. 6
      tests/Aauth/Libraries/Aauth/UserTest.php

3
application/Models/Aauth/UserModel.php

@ -101,13 +101,16 @@ class UserModel extends Model
'email' => [ 'email' => [
'is_unique' => lang('Aauth.existsAlreadyEmail'), 'is_unique' => lang('Aauth.existsAlreadyEmail'),
'valid_email' => lang('Aauth.invalidEmail'), 'valid_email' => lang('Aauth.invalidEmail'),
'required' => lang('Aauth.invalidEmail'),
], ],
'password' => [ 'password' => [
'min_length' => lang('Aauth.invalidPassword'), 'min_length' => lang('Aauth.invalidPassword'),
'max_length' => lang('Aauth.invalidPassword'), 'max_length' => lang('Aauth.invalidPassword'),
'required' => lang('Aauth.invalidPassword'),
], ],
'username' => [ 'username' => [
'is_unique' => lang('Aauth.existsAlreadyUsername'), 'is_unique' => lang('Aauth.existsAlreadyUsername'),
'min_length' => lang('Aauth.invalidUsername'),
'regex_match' => lang('Aauth.invalidUsername'), 'regex_match' => lang('Aauth.invalidUsername'),
], ],
]; ];

2
tests/Aauth/Libraries/Aauth/InfosTest.php

@ -99,7 +99,7 @@ class InfosTest extends \CIUnitTestCase
$session->start(); $session->start();
$this->assertEquals(['test message 1'], $session->getFlashdata('infos')); $this->assertEquals(['test message 1'], $session->getFlashdata('infos'));
$session->start(); $this->library = new Aauth(NULL, $session);
$this->library->info(['test message 1','test message 2'], true); $this->library->info(['test message 1','test message 2'], true);
$session->start(); $session->start();
$this->assertEquals(['test message 1','test message 2'], $session->getFlashdata('infos')); $this->assertEquals(['test message 1','test message 2'], $session->getFlashdata('infos'));

6
tests/Aauth/Libraries/Aauth/UserTest.php

@ -69,13 +69,11 @@ class UserTest extends CIDatabaseTestCase
$this->library = new Aauth(NULL, $session); $this->library = new Aauth(NULL, $session);
$this->seeInDatabase($this->config->dbTableUsers, [ $this->seeInDatabase($this->config->dbTableUsers, [
'id' => 2,
'email' => 'user@example.com', 'email' => 'user@example.com',
'username' => 'user', 'username' => 'user',
]); ]);
$this->library->updateUser(2, 'user1@example.com', 'password987654', 'user1'); $this->library->updateUser(2, 'user1@example.com', 'password987654', 'user1');
$this->seeInDatabase($this->config->dbTableUsers, [ $this->seeInDatabase($this->config->dbTableUsers, [
'id' => 2,
'email' => 'user1@example.com', 'email' => 'user1@example.com',
'username' => 'user1', 'username' => 'user1',
]); ]);
@ -116,9 +114,9 @@ class UserTest extends CIDatabaseTestCase
public function testDeleteUser() public function testDeleteUser()
{ {
$this->seeNumRecords(2, $this->config->dbTableUsers, []); $this->seeNumRecords(2, $this->config->dbTableUsers, ['deleted' => 0]);
$this->library->deleteUser(2); $this->library->deleteUser(2);
$this->seeNumRecords(1, $this->config->dbTableUsers, []); $this->seeNumRecords(1, $this->config->dbTableUsers, ['deleted' => 0]);
$this->assertFalse($this->library->deleteUser(99)); $this->assertFalse($this->library->deleteUser(99));
$this->assertEquals(lang('Aauth.notFoundUser'), $this->library->getErrorsArray()[0]); $this->assertEquals(lang('Aauth.notFoundUser'), $this->library->getErrorsArray()[0]);

Loading…
Cancel
Save