add PRG into http_post function

Author: simonLeary42

test/functional/CancelRequestTest.php

@@ -16,26 +16,18 @@ public function testCancelPIRequest()
         global $USER, $SQL;
         switchUser(...getNonExistentUser());
         // First create a request
-        try {
-            http_post(
-                __DIR__ . "/../../webroot/panel/new_account.php",
-                ["new_user_sel" => "pi", "eula" => "agree", "confirm_pi" => "agree"]
-            );
-        } catch (PhpUnitNoDieException $e) {
-            // Ignore the exception from http_post
-        }
+        http_post(
+            __DIR__ . "/../../webroot/panel/new_account.php",
+            ["new_user_sel" => "pi", "eula" => "agree", "confirm_pi" => "agree"]
+        );
 
         $this->assertNumberGroupRequests(1);
 
         // Now try to cancel it
-        try {
-            http_post(
-                __DIR__ . "/../../webroot/panel/new_account.php",
-                ["cancel" => "true"] # value of cancel is arbitrary
-            );
-        } catch (PhpUnitNoDieException $e) {
-            // Ignore the exception from http_post
-        }
+        http_post(
+            __DIR__ . "/../../webroot/panel/new_account.php",
+            ["cancel" => "true"] # value of cancel is arbitrary
+        );
 
         $this->assertNumberGroupRequests(0);
     }
@@ -45,26 +37,18 @@ public function testCancelGroupJoinRequest()
         global $USER, $SQL;
         switchUser(...getNonExistentUser());
 
-        try {
-            http_post(
-                __DIR__ . "/../../webroot/panel/new_account.php",
-                ["new_user_sel" => "not_pi", "eula" => "agree", "pi" => getExistingPI()]
-            );
-        } catch (PhpUnitNoDieException $e) {
-            // Ignore the exception from http_post
-        }
+        http_post(
+            __DIR__ . "/../../webroot/panel/new_account.php",
+            ["new_user_sel" => "not_pi", "eula" => "agree", "pi" => getExistingPI()]
+        );
 
         $this->assertNumberGroupRequests(1);
 
         // Now try to cancel it
-        try {
-            http_post(
-                __DIR__ . "/../../webroot/panel/new_account.php",
-                ["cancel" => "true"] # value of cancel is arbitrary
-            );
-        } catch (PhpUnitNoDieException $e) {
-            // Ignore the exception from http_post
-        }
+        http_post(
+            __DIR__ . "/../../webroot/panel/new_account.php",
+            ["cancel" => "true"] # value of cancel is arbitrary
+        );
 
         $this->assertNumberGroupRequests(0);
     }

test/functional/ViewAsUserTest.php

@@ -15,15 +15,13 @@ public function _testViewAsUser(array $beforeUser, array $afterUser)
         // $this->assertTrue($USER->isAdmin());
         $beforeUid = $USER->getUID();
         // $this->assertNotEquals($afterUid, $beforeUid);
-        try {
-            http_post(
-                __DIR__ . "/../../webroot/admin/user-mgmt.php",
-                [
-                    "form_name" => "viewAsUser",
-                    "uid" => $afterUid,
-                ],
-            );
-        } catch (PhpUnitNoDieException) {}
+        http_post(
+            __DIR__ . "/../../webroot/admin/user-mgmt.php",
+            [
+                "form_name" => "viewAsUser",
+                "uid" => $afterUid,
+            ],
+        );
         $this->assertArrayHasKey("viewUser", $_SESSION);
         // redirect means that php process dies and user's browser will initiate a new one
         // this makes `require_once autoload.php` run again and init.php changes $USER
@@ -32,12 +30,10 @@ public function _testViewAsUser(array $beforeUser, array $afterUser)
         // now we should be new user
         $this->assertEquals($afterUid, $USER->getUID());
         // $this->assertTrue($_SESSION["user_exists"]);
-        try {
-            http_post(
-                __DIR__ . "/../../resources/templates/header.php",
-                ["form_name" => "clearView"],
-            );
-        } catch (PhpUnitNoDieException) {}
+        http_post(
+            __DIR__ . "/../../resources/templates/header.php",
+            ["form_name" => "clearView"],
+        );
         $this->assertArrayNotHasKey("viewUser", $_SESSION);
         // redirect means that php process dies and user's browser will initiate a new one
         // this makes `require_once autoload.php` run again and init.php changes $USER
@@ -69,15 +65,13 @@ public function testNonAdminViewAsAdmin()
         $adminUid = $USER->getUID();
         $this->assertTrue($USER->isAdmin());
         switchUser(...getNormalUser());
-        try {
-            http_post(
-                __DIR__ . "/../../webroot/admin/user-mgmt.php",
-                [
-                    "form_name" => "viewAsUser",
-                    "uid" => $adminUid,
-                ],
-            );
-        } catch (PhpUnitNoDieException) {}
+        http_post(
+            __DIR__ . "/../../webroot/admin/user-mgmt.php",
+            [
+                "form_name" => "viewAsUser",
+                "uid" => $adminUid,
+            ],
+        );
         $this->assertArrayNotHasKey("viewUser", $_SESSION);
     }
 }

test/phpunit-bootstrap.php

@@ -81,13 +81,17 @@ function http_post(string $phpfile, array $post_data): void
     $_SERVER["PHP_SELF"] = preg_replace("/.*webroot\//", "/", $phpfile);
     $_POST = $post_data;
     ob_start();
+    $post_did_redirect = false;
     try {
         include $phpfile;
+    } catch (UnityWebPortal\lib\exceptions\PhpUnitNoDieException $e) {
+        $post_did_redirect = true;
     } finally {
         ob_get_clean(); // discard output
         unset($_POST);
         $_SERVER = $_PREVIOUS_SERVER;
     }
+    assert($post_did_redirect, "post did not redirect!");
 }
 
 function http_get(string $phpfile, array $get_data = array()): void