do a global config rollback at the end of every test

shish · Feb 10, 2025 · 1564098 · 1564098
1 parent 16c3622
commit 1564098
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 42 deletions.
diff --git a/core/testcase.php b/core/testcase.php
@@ -24,6 +24,8 @@ abstract class ShimmiePHPUnitTestCase extends TestBase
     protected static string $admin_name = "demo";
     protected static string $user_name = "test";
     protected string $wipe_time = "test";
+    /** @var array<string, string> */
+    private array $config_snapshot = [];
 
     /**
      * Start a DB transaction for each test class
@@ -41,7 +43,7 @@ public static function setUpBeforeClass(): void
      */
     public function setUp(): void
     {
-        global $database, $_tracer, $page;
+        global $database, $_tracer, $page, $config;
         $_tracer->begin($this->name());
         $_tracer->begin("setUp");
         $class = str_replace("Test", "", get_class($this));
@@ -60,15 +62,17 @@ public function setUp(): void
             send_event(new ImageDeletionEvent(Image::by_id_ex((int)$image_id), true));
         }
         $page = new Page();
+        $this->config_snapshot = $config->values;
 
         $_tracer->end();  # setUp
         $_tracer->begin("test");
     }
 
     public function tearDown(): void
     {
-        global $_tracer, $database;
+        global $_tracer, $config, $database;
         $database->execute("ROLLBACK TO test_start");
+        $config->values = $this->config_snapshot;
         $_tracer->end();  # test
         $_tracer->end();  # $this->getName()
     }

diff --git a/ext/approval/test.php b/ext/approval/test.php
@@ -33,11 +33,4 @@ public function testApprovalNeeded(): void
         $this->log_in_as_user();
         $this->assert_search_results(["some_tag"], [$image_id]);
     }
-
-    public function tearDown(): void
-    {
-        global $config;
-        $config->set_bool(ApprovalConfig::IMAGES, false);
-        parent::tearDown();
-    }
 }
diff --git a/ext/comment/test.php b/ext/comment/test.php
@@ -14,13 +14,6 @@ public function setUp(): void
         $this->log_out();
     }
 
-    public function tearDown(): void
-    {
-        global $config;
-        $config->set_int(CommentConfig::LIMIT, 10);
-        parent::tearDown();
-    }
-
     public function testCommentsPage(): void
     {
         global $user;

diff --git a/ext/downtime/test.php b/ext/downtime/test.php
@@ -6,13 +6,6 @@
 
 class DowntimeTest extends ShimmiePHPUnitTestCase
 {
-    public function tearDown(): void
-    {
-        global $config;
-        $config->set_bool("downtime", false);
-        parent::tearDown();
-    }
-
     public function testDowntime(): void
     {
         global $config;

diff --git a/ext/rating/test.php b/ext/rating/test.php
@@ -107,9 +107,7 @@ public function testCountImages(): void
     // that it doesn't mess with other unrelated tests
     public function tearDown(): void
     {
-        global $config, $user_config;
-        $config->set_array("ext_rating_user_privs", ["?", "s", "q", "e"]);
-        $config->set_array("ext_rating_anonymous_privs", ["?", "s", "q", "e"]);
+        global $user_config;
 
         $this->log_in_as_user();
         $user_config->set_array(RatingsConfig::USER_DEFAULTS, ["?", "s", "q", "e"]);

diff --git a/ext/ratings_blur/test.php b/ext/ratings_blur/test.php
@@ -122,8 +122,7 @@ private function delete_test_user(string $username): void
     // that it doesn't mess with other unrelated tests
     public function tearDown(): void
     {
-        global $config, $user_config;
-        $config->set_array(RatingsBlurConfig::GLOBAL_DEFAULTS, RatingsBlurConfig::DEFAULT_OPTIONS);
+        global $user_config;
 
         $this->log_in_as_user();
         $user_config->set_array(RatingsBlurConfig::USER_DEFAULTS, RatingsBlurConfig::DEFAULT_OPTIONS);

diff --git a/ext/res_limit/test.php b/ext/res_limit/test.php
@@ -66,18 +66,4 @@ public function testResLimitRatio(): void
         });
         $this->assertEquals("Post needs to be in one of these ratios: 16:9", $e->getMessage());
     }
-
-    # reset to defaults, otherwise this can interfere with
-    # other extensions' test suites
-    public function tearDown(): void
-    {
-        global $config;
-        $config->delete("upload_min_height");
-        $config->delete("upload_min_width");
-        $config->delete("upload_max_height");
-        $config->delete("upload_max_width");
-        $config->delete("upload_ratios");
-
-        parent::tearDown();
-    }
 }