add test for creating multiple users

Author: simonLeary42

test/functional/NewUserTest.php

@@ -112,11 +112,12 @@ private function ensureUserDoesNotExist()
         }
         $all_users_group = $LDAP->getUserGroup();
         $all_member_uids = $all_users_group->getAttribute("memberuid");
-        $new_uids = array_diff($all_member_uids, [$USER->uid]);
         if (in_array($USER->uid, $all_member_uids)) {
             $all_users_group->setAttribute(
                 "memberuid",
-                array_diff($all_member_uids, [$USER->uid])
+                // array_diff will break the contiguity of the array indexes
+                // ldap_mod_replace requires contiguity, array_values restores contiguity
+                array_values(array_diff($all_member_uids, [$USER->uid]))
             );
             $all_users_group->write();
             assert(!in_array($USER->uid, $all_users_group->getAttribute("memberuid")));
@@ -221,6 +222,41 @@ public function testCreateUserByJoinGoupByPI()
         }
     }
 
+    public function testCreateMultipleUsersByJoinGoupByPI()
+    {
+        global $USER, $SSO, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK;
+        $pi_user_args = getUserIsPIHasNoMembersNoMemberRequests();
+        switchUser(...$pi_user_args);
+        $pi_group = $USER->getPIGroup();
+        $gid = $pi_group->gid;
+        $this->assertTrue($pi_group->exists());
+        $users_to_create_args = getNonexistentUsersWithExistentOrg();
+        try {
+            foreach ($users_to_create_args as $user_to_create_args) {
+                switchUser(...$user_to_create_args);
+                $this->assertTrue(!$USER->exists());
+                $this->assertTrue(!$pi_group->userExists($USER));
+                $this->assertRequestedMembership(false, $gid);
+                $this->requestGroupMembership($pi_group->gid);
+                $this->assertRequestedMembership(true, $gid);
+                $approve_uid = $USER->uid;
+                switchUser(...$pi_user_args);
+                // $this->assertTrue(!$pi_group->userExists($USER));
+                $this->approveUserByPI($approve_uid);
+                switchUser(...$user_to_create_args);
+                $this->assertTrue(!$pi_group->requestExists($USER));
+                $this->assertRequestedMembership(false, $gid);
+                $this->assertTrue($pi_group->userExists($USER));
+                $this->assertTrue($USER->exists());
+            }
+        } finally {
+            foreach ($users_to_create_args as $user_to_create_args) {
+                switchUser(...$user_to_create_args);
+                $this->ensureUserNotInPIGroup($pi_group);
+                $this->ensureUserDoesNotExist();
+            }
+        }
+    }
 
     public function testCreateUserByJoinGoupByAdmin()
     {

test/phpunit-bootstrap.php

@@ -177,6 +177,14 @@ function getNonExistentUser()
     return ["user2001@org998.test", "foo", "bar", "user2001@org998.test"];
 }
 
+function getNonexistentUsersWithExistentOrg()
+{
+    return [
+        ["user2003@org1.test", "foo", "bar", "user2003@org1.test"],
+        ["user2004@org1.test", "foo", "bar", "user2004@org1.test"],
+    ];
+}
+
 function getAdminUser()
 {
     return ["user1@org1.test", "foo", "bar", "user1@org1.test"];

tools/docker-dev/web/htpasswd

@@ -1302,6 +1302,10 @@ user1304@org1.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
 user1313@org1.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
 user1322@org14.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
 user1326@org14.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
+# nonexistent users
 user2000@org2.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
 user2001@org998.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
 user2002@org999.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
+# nonexistent users with an existent org
+user2003@org1.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1
+user2004@org1.test:$apr1$Rgrex74Z$rgJx6sCnGQN9UVMmhVG2R1