Browse Source

updated Libraries/Aauth, ErrorsTest, InfosTest & UserTest

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

6
application/Libraries/Aauth.php

@ -936,7 +936,8 @@ class Aauth
{
if ($includeNonFlash)
{
$this->flashErrors = array_merge($this->session->getFlashdata('errors'), $this->errors);
$flashErrorsOld = $this->session->getFlashdata('errors');
$this->flashErrors = array_merge((is_array($flashErrorsOld) ? $flashErrorsOld : []), $this->errors);
$this->session->setFlashdata('errors', $this->flashErrors);
}
else
@ -1049,7 +1050,8 @@ class Aauth
{
if ($includeNonFlash)
{
$this->flashInfos = array_merge($this->session->getFlashdata('infos'), $this->infos);
$flashInfosOld = $this->session->getFlashdata('infos');
$this->flashInfos = array_merge((is_array($flashInfosOld) ? $flashInfosOld : []), $this->infos);
$this->session->setFlashdata('infos', $this->flashInfos);
}
else

1
tests/Aauth/Libraries/Aauth/ErrorsTest.php

@ -114,7 +114,6 @@ class ErrorsTest extends \CIUnitTestCase
$this->library->keepErrors();
$session->start();
$this->assertEquals(['test message 1 Flash'], $session->getFlashdata('errors'));
$session->start();
$this->library = new Aauth(null, $session);
$this->library->error('test message 1 NonFlash');
$this->library->keepErrors(true);

1
tests/Aauth/Libraries/Aauth/InfosTest.php

@ -114,7 +114,6 @@ class InfosTest extends \CIUnitTestCase
$this->library->keepInfos();
$session->start();
$this->assertEquals(['test message 1 Flash'], $session->getFlashdata('infos'));
$session->start();
$this->library = new Aauth(null, $session);
$this->library->info('test message 1 NonFlash');
$this->library->keepInfos(true);

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

@ -73,7 +73,6 @@ class UserTest extends CIDatabaseTestCase
$this->library = new Aauth(null, true);
$this->assertFalse($this->library->createUser('admin@example.com', 'password123456', null));
print_r($this->library->getErrorsArray());
$this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]);
$this->library = new Aauth(null, true);
@ -114,7 +113,6 @@ class UserTest extends CIDatabaseTestCase
$this->library = new Aauth(null, true);
$this->assertFalse($this->library->updateUser(2, 'admin@example.com', null, null));
print_r($this->library->getErrorsArray());
$this->assertEquals(lang('Aauth.existsAlreadyEmail'), $this->library->getErrorsArray()[0]);
$this->library = new Aauth(null, true);

Loading…
Cancel
Save