From 643290bf2bf33aa69c3a39bbbfa1c76f448b30cf Mon Sep 17 00:00:00 2001 From: REJack Date: Fri, 25 Jan 2019 14:50:09 +0100 Subject: [PATCH] updated Libraries/Aauth, GroupTest, PermTest & UserTest --- app/Libraries/Aauth.php | 2 +- tests/Aauth/Libraries/Aauth/GroupTest.php | 4 +++- tests/Aauth/Libraries/Aauth/PermTest.php | 2 +- tests/Aauth/Libraries/Aauth/UserTest.php | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Libraries/Aauth.php b/app/Libraries/Aauth.php index 9e8d16b..a855c4f 100644 --- a/app/Libraries/Aauth.php +++ b/app/Libraries/Aauth.php @@ -1511,7 +1511,7 @@ class Aauth return false; } - else if (! $groupId = $subgroupId) + else if ($groupId === $subgroupId) { return false; } diff --git a/tests/Aauth/Libraries/Aauth/GroupTest.php b/tests/Aauth/Libraries/Aauth/GroupTest.php index e0549e7..ffd14f8 100644 --- a/tests/Aauth/Libraries/Aauth/GroupTest.php +++ b/tests/Aauth/Libraries/Aauth/GroupTest.php @@ -102,7 +102,7 @@ class GroupTest extends CIDatabaseTestCase $this->assertEquals(lang('Aauth.existsAlreadyGroup'), $this->library->getErrorsArray()[0]); $this->library = new Aauth(null, true); - $this->assertFalse($this->library->updateGroup($this->config->groupAdmin)); + $this->assertTrue($this->library->updateGroup($this->config->groupAdmin)); $this->assertCount(0, $this->library->getErrorsArray()); $this->library = new Aauth(null, true); @@ -334,6 +334,8 @@ class GroupTest extends CIDatabaseTestCase $this->assertTrue($this->library->addSubgroup('testGroup1', 'testGroup3')); $subgroups = $this->library->getSubgroups(4); + + var_dump( $subgroups); $this->assertCount(2, $subgroups); $this->assertEquals([['subgroup_id' => '5'], ['subgroup_id' => '6']], $subgroups); $this->assertFalse($this->library->getSubgroups('testGroup99')); diff --git a/tests/Aauth/Libraries/Aauth/PermTest.php b/tests/Aauth/Libraries/Aauth/PermTest.php index c8a818b..3887ca0 100644 --- a/tests/Aauth/Libraries/Aauth/PermTest.php +++ b/tests/Aauth/Libraries/Aauth/PermTest.php @@ -98,7 +98,7 @@ class PermTest extends CIDatabaseTestCase $this->assertEquals(lang('Aauth.existsAlreadyPerm'), $this->library->getErrorsArray()[0]); $this->library = new Aauth(null, true); - $this->assertFalse($this->library->updatePerm('testPerm1')); + $this->assertTrue($this->library->updatePerm('testPerm1')); $this->assertCount(0, $this->library->getErrorsArray()); $this->library = new Aauth(null, true); diff --git a/tests/Aauth/Libraries/Aauth/UserTest.php b/tests/Aauth/Libraries/Aauth/UserTest.php index 9e0b044..15d350b 100644 --- a/tests/Aauth/Libraries/Aauth/UserTest.php +++ b/tests/Aauth/Libraries/Aauth/UserTest.php @@ -133,7 +133,7 @@ class UserTest extends CIDatabaseTestCase $this->assertEquals(lang('Aauth.invalidUsername'), $this->library->getErrorsArray()[0]); $this->library = new Aauth(null, true); - $this->assertFalse($this->library->updateUser(2)); + $this->assertTrue($this->library->updateUser(2)); $this->assertCount(0, $this->library->getErrorsArray()); $this->library = new Aauth(null, true);