composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2574 - 💚 fix unit test

Browse Source 
The behaviours has changed since the "password_renewed_date" is not changed only after the inter/update and no more just aftyer the $oUserLocal->Set('password')
This commit is contained in:
bruno DA SILVA
2020-02-18 14:49:10 +01:00
parent dba6e8ce1a
commit 412f1a394f
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
datamodels/2.x/authent-local/model.authent-local.php
View File

@@ -177,8 +177,20 @@ class UserLocal extends UserInternal
protected function OnUpdate()
{
parent::OnUpdate(); // TODO: Change the autogenerated stub
parent::OnUpdate();
$this->OnWrite();
}
protected function OnInsert()
{
parent::OnInsert();
$this->OnWrite();
}
protected function OnWrite()
{
if (empty($this->m_oPasswordValidity))
{
return;
@@ -204,6 +216,7 @@ class UserLocal extends UserInternal
return (empty($this->m_oPasswordValidity)) || ($this->m_oPasswordValidity->isPasswordValid());
}
public function getPasswordValidityMessage()
{
if (ContextTag::Check(ContextTag::TAG_SETUP))
@@ -220,7 +233,6 @@ class UserLocal extends UserInternal
return $this->m_oPasswordValidity->getPasswordValidityMessage();
}
/**
* set the $m_oPasswordValidity based on UserLocalPasswordValidator instances vote.
*
@@ -281,7 +293,7 @@ class UserLocal extends UserInternal
{
if (strpos('contactid,login,language,password,status,profile_list,allowed_org_list', $sAttCode) !== false)
{
// contactid and allowed_org_list are disabled to make sure the portal remains accessible
// contactid and allowed_org_list are disabled to make sure the portal remains accessible
$aReasons[] = 'Sorry, this attribute is read-only in the demonstration mode!';
$iFlags |= OPT_ATT_READONLY;
}

26
test/coreExtensions/UserLocalTest.php
View File

@@ -8,6 +8,7 @@
namespace coreExtensions;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use UserLocal;
use UserLocalPasswordPolicyMockNotValid;
@@ -24,7 +25,7 @@ use UserPasswordPolicyRegex;
* @preserveGlobalState disabled
* @backupGlobals disabled
*/
class UserLocalTest extends ItopTestCase
class UserLocalTest extends ItopDataTestCase
{
public function setUp()
@@ -274,11 +275,30 @@ class UserLocalTest extends ItopTestCase
\MetaModel::NewObject('URP_UserProfile', array('profileid' => 1))
);
$this->assertEquals($oBefore, $oUserLocal->Get('password_renewed_date'));
$oUserLocal->Set('password', 'foo');
//INSERT
$oUserLocal->Set('password', 'fooBar1???');
$oUserLocal->DBWrite();
$this->assertEquals($oBefore, $oUserLocal->Get('password_renewed_date'), 'INSERT changes the "password_renewed_date"');
$this->assertEquals($oExpectedAfter, $oUserLocal->Get('password_renewed_date'));
//UPDATE password_renewed_date
$oUserLocal->Set('password_renewed_date', $oBefore);
$oUserLocal->DBWrite();
$this->assertEquals($oBefore, $oUserLocal->Get('password_renewed_date'), 'UPDATE can target and change the "password_renewed_date"');
//UPDATE password
$oUserLocal->Set('password', 'fooBar1???1');
$oUserLocal->DBWrite();
$this->assertEquals($oExpectedAfter, $oUserLocal->Get('password_renewed_date'), 'UPDATE "password" fields trigger automatic change of the "password_renewed_date" field');
//UPDATE both password & password_renewed_date
$oUserLocal->Set('password', 'fooBar1???2');
$oUserLocal->Set('password_renewed_date', $oBefore);
$oUserLocal->DBWrite();
$this->assertEquals($oBefore, $oUserLocal->Get('password_renewed_date'), 'UPDATE can target and change both "password" and "password_renewed_date"');
}
public function ProviderPasswordRenewal()