From aeb92737caa1ffcfead5af289c2d73d517af42f0 Mon Sep 17 00:00:00 2001
From: REJack <info@rejack.de>
Date: Tue, 11 Dec 2018 14:39:35 +0100
Subject: [PATCH] updated UserModel, InfosTest & UserTest

---
 application/Models/Aauth/UserModel.php    | 3 +++
 tests/Aauth/Libraries/Aauth/InfosTest.php | 2 +-
 tests/Aauth/Libraries/Aauth/UserTest.php  | 6 ++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/Models/Aauth/UserModel.php b/application/Models/Aauth/UserModel.php
index df3b261..c810809 100644
--- a/application/Models/Aauth/UserModel.php
+++ b/application/Models/Aauth/UserModel.php
@@ -101,13 +101,16 @@ class UserModel extends Model
 			'email'    => [
 				'is_unique'   => lang('Aauth.existsAlreadyEmail'),
 				'valid_email' => lang('Aauth.invalidEmail'),
+				'required' => lang('Aauth.invalidEmail'),
 			],
 			'password' => [
 				'min_length' => lang('Aauth.invalidPassword'),
 				'max_length' => lang('Aauth.invalidPassword'),
+				'required' => lang('Aauth.invalidPassword'),
 			],
 			'username' => [
 				'is_unique'  => lang('Aauth.existsAlreadyUsername'),
+				'min_length' => lang('Aauth.invalidUsername'),
 				'regex_match' => lang('Aauth.invalidUsername'),
 			],
 		];
diff --git a/tests/Aauth/Libraries/Aauth/InfosTest.php b/tests/Aauth/Libraries/Aauth/InfosTest.php
index 4957b9b..8f1d9b2 100644
--- a/tests/Aauth/Libraries/Aauth/InfosTest.php
+++ b/tests/Aauth/Libraries/Aauth/InfosTest.php
@@ -99,7 +99,7 @@ class InfosTest extends \CIUnitTestCase
         $session->start();
 		$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);
         $session->start();
 		$this->assertEquals(['test message 1','test message 2'], $session->getFlashdata('infos'));
diff --git a/tests/Aauth/Libraries/Aauth/UserTest.php b/tests/Aauth/Libraries/Aauth/UserTest.php
index d5bea7a..87d1eda 100644
--- a/tests/Aauth/Libraries/Aauth/UserTest.php
+++ b/tests/Aauth/Libraries/Aauth/UserTest.php
@@ -69,13 +69,11 @@ class UserTest extends CIDatabaseTestCase
 	    $this->library = new Aauth(NULL, $session);
 
 		$this->seeInDatabase($this->config->dbTableUsers, [
-		    'id' => 2,
 		    'email' => 'user@example.com',
 		    'username' => 'user',
 		]);
     	$this->library->updateUser(2, 'user1@example.com', 'password987654', 'user1');
 		$this->seeInDatabase($this->config->dbTableUsers, [
-		    'id' => 2,
 		    'email' => 'user1@example.com',
 		    'username' => 'user1',
 		]);
@@ -116,9 +114,9 @@ class UserTest extends CIDatabaseTestCase
 
 	public function testDeleteUser()
 	{
-		$this->seeNumRecords(2, $this->config->dbTableUsers, []);
+		$this->seeNumRecords(2, $this->config->dbTableUsers, ['deleted' => 0]);
 		$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->assertEquals(lang('Aauth.notFoundUser'), $this->library->getErrorsArray()[0]);