From 052d1d03d1578a122b22be74cc438050ac751d61 Mon Sep 17 00:00:00 2001
From: Simon Leary <simon.leary42@proton.me>
Date: Mon, 10 Nov 2025 15:17:46 -0500
Subject: [PATCH] test PI membership requests using mail

---
 test/functional/NewUserTest.php         | 6 +++---
 test/functional/PIMemberRequestTest.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/functional/NewUserTest.php b/test/functional/NewUserTest.php
index 97e97f2a..93a37d4c 100644
--- a/test/functional/NewUserTest.php
+++ b/test/functional/NewUserTest.php
@@ -40,12 +40,12 @@ private function requestGroupCreation()
         ]);
     }
 
-    private function requestGroupMembership(string $gid)
+    private function requestGroupMembership(string $gid_or_mail)
     {
         http_post(__DIR__ . "/../../webroot/panel/new_account.php", [
             "new_user_sel" => "not_pi",
             "eula" => "agree",
-            "pi" => $gid,
+            "pi" => $gid_or_mail,
         ]);
     }
 
@@ -294,7 +294,7 @@ public function testCreateUserByJoinGoupByAdmin($user_to_create_args, $expected_
             $this->cancelAllRequests();
             $this->assertRequestedMembership(false, $gid);
 
-            $this->requestGroupMembership($pi_group->gid);
+            $this->requestGroupMembership($pi_group->getOwner()->getMail());
             $this->assertTrue($pi_group->requestExists($USER));
             $this->assertRequestedMembership(true, $gid);
 
diff --git a/test/functional/PIMemberRequestTest.php b/test/functional/PIMemberRequestTest.php
index fac07b5a..51a6f705 100644
--- a/test/functional/PIMemberRequestTest.php
+++ b/test/functional/PIMemberRequestTest.php
@@ -5,11 +5,11 @@
 
 class PiMemberRequestTest extends TestCase
 {
-    private function requestMembership(string $gid)
+    private function requestMembership(string $gid_or_mail)
     {
         http_post(__DIR__ . "/../../webroot/panel/groups.php", [
             "form_type" => "addPIform",
-            "pi" => $gid,
+            "pi" => $gid_or_mail,
         ]);
     }
 
@@ -42,7 +42,7 @@ public function testRequestMembership()
             $this->assertTrue($SQL->requestExists($uid, $gid));
             $this->cancelRequest($gid);
             $this->assertFalse($SQL->requestExists($uid, $gid));
-            $this->requestMembership($gid);
+            $this->requestMembership($pi_group->getOwner()->getMail());
             $this->assertTrue($SQL->requestExists($uid, $gid));
         } finally {
             if ($SQL->requestExists($uid, $gid)) {