aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouis Chemineau <louis@chmn.me>2022-01-07 10:04:42 +0100
committerJohn Molakvoæ <skjnldsv@protonmail.com>2022-01-08 10:15:48 +0100
commit447cd553b6a804cf83ed639a3b5792c46ec196cb (patch)
tree48919a478394a4d54c1a860c91a621b4cd7e4e3a
parent6f62c17a95b9bac78cb064e7b51bcbae28decffa (diff)
downloadnextcloud-server-447cd553b6a804cf83ed639a3b5792c46ec196cb.tar.gz
nextcloud-server-447cd553b6a804cf83ed639a3b5792c46ec196cb.zip
Reset $scriptDeps in tests
Signed-off-by: Louis Chemineau <louis@chmn.me>
-rw-r--r--lib/public/Util.php10
-rw-r--r--tests/lib/UtilTest.php2
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/public/Util.php b/lib/public/Util.php
index f8d8b1aaf71..61b8d9369cc 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -597,4 +597,14 @@ class Util {
}
return $temp;
}
+
+ /**
+ * Reset scripts and scriptDeps to empty arrays.
+ * Only used in tests.
+ * @since 24.0.0
+ */
+ public static function clearScriptsState() {
+ self::$scripts = [];
+ self::$scriptDeps = [];
+ }
}
diff --git a/tests/lib/UtilTest.php b/tests/lib/UtilTest.php
index c394792a72f..4734898a787 100644
--- a/tests/lib/UtilTest.php
+++ b/tests/lib/UtilTest.php
@@ -224,6 +224,7 @@ class UtilTest extends \Test\TestCase {
parent::setUp();
\OC_Util::$scripts = [];
+ \OCP\Util::clearScriptsState();
\OC_Util::$styles = [];
self::invokePrivate(\OCP\Util::class, 'scripts', [[]]);
}
@@ -231,6 +232,7 @@ class UtilTest extends \Test\TestCase {
parent::tearDown();
\OC_Util::$scripts = [];
+ \OCP\Util::clearScriptsState();
\OC_Util::$styles = [];
self::invokePrivate(\OCP\Util::class, 'scripts', [[]]);
}