Fix #350: Update unit tests with changes made to climaintenance.php

catalyst · Nov 26, 2024 · 2a55769 · 2a55769
1 parent 68959e3
commit 2a55769
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tests/local/outagelib_test.php b/tests/local/outagelib_test.php
@@ -323,8 +323,9 @@ public function test_createmaintenancephpcode() {
     }
     // Put access key as a cookie if given. This stops the need to put it as a url param on every request.
     $urlaccesskey = optional_param('accesskey', null, PARAM_TEXT);
+    $isphpunit = defined('PHPUNIT_TEST');
 
-    if (!empty($urlaccesskey)) {
+    if (!empty($urlaccesskey) && !$isphpunit) {
         setcookie('auth_outage_accesskey', $urlaccesskey, time() + 86400, '/', '', true, false);
     }
 
@@ -336,7 +337,6 @@ public function test_createmaintenancephpcode() {
 e.e.e.e/20');
     $accesskeyblocked = $useraccesskey != '12345';
     $allowed = (true && !$accesskeyblocked) || (true && !$ipblocked);
-    $isphpunit = defined('PHPUNIT_TEST');
 
     if (!$allowed) {
         if (!$isphpunit) {
@@ -404,8 +404,9 @@ public function test_createmaintenancephpcode_withoutage($configkey) {
     }
     // Put access key as a cookie if given. This stops the need to put it as a url param on every request.
     $urlaccesskey = optional_param('accesskey', null, PARAM_TEXT);
+    $isphpunit = defined('PHPUNIT_TEST');
 
-    if (!empty($urlaccesskey)) {
+    if (!empty($urlaccesskey) && !$isphpunit) {
         setcookie('auth_outage_accesskey', $urlaccesskey, time() + 86400, '/', '', true, false);
     }
 
@@ -415,7 +416,6 @@ public function test_createmaintenancephpcode_withoutage($configkey) {
     $ipblocked = !remoteip_in_list('127.0.0.1');
     $accesskeyblocked = $useraccesskey != '5678';
     $allowed = (true && !$accesskeyblocked) || (true && !$ipblocked);
-    $isphpunit = defined('PHPUNIT_TEST');
 
     if (!$allowed) {
         if (!$isphpunit) {