fix test helper functions

Author: simonLeary42

test/functional/QualifyUserTest.php

@@ -23,28 +23,31 @@ private function assertRequestedMembership(bool $expected, string $gid)
 
     private function requestGroupCreation()
     {
-        http_post(__DIR__ . "/../../webroot/panel/new_account.php", [
-            "new_user_sel" => "pi",
-            "eula" => "agree",
-            "confirm_pi" => "agree",
-        ]);
+        http_post(__DIR__ . "/../../webroot/panel/account.php", ["form_type" => "pi_request"]);
     }
 
     private function requestGroupMembership(string $gid_or_mail)
     {
-        http_post(__DIR__ . "/../../webroot/panel/new_account.php", [
-            "new_user_sel" => "not_pi",
-            "eula" => "agree",
+        http_post(__DIR__ . "/../../webroot/panel/groups.php", [
+            "form_type" => "addPIform",
+            "tos" => "agree",
             "pi" => $gid_or_mail,
         ]);
     }
 
-    private function cancelAllRequests()
+    private function cancelRequestGroupMembership($gid)
     {
-        http_post(
-            __DIR__ . "/../../webroot/panel/new_account.php",
-            ["cancel" => "true"], // value of cancel is arbitrary
-        );
+        http_post(__DIR__ . "/../../webroot/panel/groups.php", [
+            "form_type" => "cancelPIform",
+            "pi" => $gid,
+        ]);
+    }
+
+    private function cancelRequestGroupCreation()
+    {
+        http_post(__DIR__ . "/../../webroot/panel/account.php", [
+            "form_type" => "cancel_pi_request",
+        ]);
     }
 
     private function approveUserByAdmin($gid, $uid)
@@ -103,7 +106,7 @@ public function testQualifyUserByJoinGoupByPI()
             // $this->assertTrue($second_request_failed);
             $this->assertRequestedMembership(true, $gid);
 
-            $this->cancelAllRequests();
+            $this->cancelRequestGroupMembership($gid);
             $this->assertRequestedMembership(false, $gid);
 
             $this->requestGroupMembership($pi_group->gid);
@@ -200,7 +203,7 @@ public function testQualifyUserByJoinGoupByAdmin()
             // $this->assertTrue($second_request_failed);
             $this->assertRequestedMembership(true, $gid);
 
-            $this->cancelAllRequests();
+            $this->cancelRequestGroupMembership($gid);
             $this->assertRequestedMembership(false, $gid);
 
             $this->requestGroupMembership($pi_group->getOwner()->getMail());
@@ -258,7 +261,7 @@ public function testQualifyUserByCreateGroup()
             // $this->assertTrue($second_request_failed);
             $this->assertRequestedPIGroup(true);
 
-            $this->cancelAllRequests();
+            $this->cancelRequestGroupCreation();
             $this->assertRequestedPIGroup(false);
 
             $this->requestGroupCreation();