Pass list of test dirs into Unit_Test::_constructor() as an argument

instead of modifying the config.

1 files changed, 8 insertions, 4 deletions

diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index d5ea21ed..0275ed79 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -76,23 +76,27 @@ class Gallery_Unit_Test_Controller extends Controller {
 
     // Install all modules
     core_installer::install();
+    $modules = array();
     foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
       $module_name = basename(dirname(dirname($file)));
       if ($module_name == "core") {
         continue;
       }
 
-      $modules = Kohana::config('core.modules');
-      $modules[] = MODPATH . $module_name;
-      Kohana::config_set('core.modules', $modules);
       require_once(DOCROOT . "modules/${module_name}/helpers/${module_name}_installer.php");
 
+      $test_dir = MODPATH . "$module_name/tests";
+      if (file_exists($test_dir)) {
+        $modules[] = $test_dir;
+      }
+
       $installer_class = "{$module_name}_installer";
       if (method_exists($installer_class, "install")) {
         call_user_func_array(array($installer_class, "install"), array());
       }
     }
 
-    print new Unit_Test();
+    $filter = count($_SERVER["argv"]) > 2 ? $_SERVER["argv"][2] : null;
+    print new Unit_Test($modules, $filter);
   }
 }