diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php index f0245561..6849b0e6 100644 --- a/test/functional/NewUserTest.php +++ b/test/functional/NewUserTest.php @@ -94,7 +94,7 @@ private function approveGroup($uid) // does not remove user from PI groups private function ensureUserDoesNotExist() { - global $USER, $SQL, $LDAP; + global $USER, $SQL, $LDAP, $REDIS; $SQL->deleteRequestsByUser($USER->uid); if ($USER->exists()) { $org = $USER->getOrgGroup(); @@ -116,6 +116,7 @@ private function ensureUserDoesNotExist() $all_users_group->write(); assert(!in_array($USER->uid, $all_users_group->getAttribute("memberuid"))); } + $REDIS->removeCacheArray("sorted_users", "", $USER->uid); } private function ensureOrgGroupDoesNotExist() @@ -126,24 +127,28 @@ private function ensureOrgGroupDoesNotExist() $org_group->delete(); assert(!$org_group->exists()); } + $REDIS->removeCacheArray("sorted_orgs", "", $SSO["org"]); } private function ensureUserNotInPIGroup(UnityGroup $pi_group) { - global $USER; + global $USER, $REDIS; if ($pi_group->userExists($USER)) { $pi_group->removeUser($USER); assert(!$pi_group->userExists($USER)); } + $REDIS->removeCacheArray($pi_group->gid, "members", $USER->uid); } private function ensurePIGroupDoesNotExist() { - global $USER, $LDAP; + global $USER, $LDAP, $REDIS; + $gid = $USER->getPIGroup()->gid; if ($USER->getPIGroup()->exists()) { - $LDAP->getPIGroupEntry($USER->getPIGroup()->gid)->delete(); + $LDAP->getPIGroupEntry($gid)->delete(); assert(!$USER->getPIGroup()->exists()); } + $REDIS->removeCacheArray("sorted_groups", "", $gid); } public function testCreateUserByJoinGoupByPI() @@ -327,6 +332,7 @@ public function testCreateUserByCreateGroup() // $this->assertTrue($third_request_failed); $this->assertRequestedPIGroup(false); } finally { + switchUser(...$user_to_create_args); $this->ensureOrgGroupDoesNotExist(); $this->ensurePIGroupDoesNotExist(); $this->ensureUserDoesNotExist(); diff --git a/test/functional/PageLoadTest.php b/test/functional/PageLoadTest.php new file mode 100644 index 00000000..71d531dd --- /dev/null +++ b/test/functional/PageLoadTest.php @@ -0,0 +1,35 @@ +assertTrue(true); // assert there were no errors + } +} diff --git a/webroot/panel/support.php b/webroot/panel/support.php index cfc91d2a..d941a964 100644 --- a/webroot/panel/support.php +++ b/webroot/panel/support.php @@ -1,6 +1,6 @@