summaryrefslogtreecommitdiff
path: root/modules/gallery_unit_test
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery_unit_test')
-rw-r--r--modules/gallery_unit_test/controllers/gallery_unit_test.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index a5dbcc1f..85747884 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -96,6 +96,8 @@ class Gallery_Unit_Test_Controller extends Controller {
@system("rm -rf test/var");
@mkdir('test/var/logs', 0777, true);
+ $active_modules = module::$active;
+
// Reset our caches
module::$modules = array();
module::$active = array();
@@ -113,13 +115,12 @@ class Gallery_Unit_Test_Controller extends Controller {
module::install("user");
module::activate("user");
$modules = array();
- foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
- $module_name = basename(dirname(dirname($file)));
- if (in_array($module_name, array("gallery", "user"))) {
+ foreach ($active_modules as $module) {
+ if (in_array($module->name, array("gallery", "user"))) {
continue;
}
- module::install($module_name);
- module::activate($module_name);
+ module::install($module->name);
+ module::activate($module->name);
}
// Trigger late-binding install actions (defined in gallery_event::user_login)