PHPUnit fixes for custom locations

nextcloud · May 7, 2017 · bb6c7a1 · bb6c7a1
1 parent c4f8439
commit bb6c7a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/launch_phpunit.sh → launch_phpunit.sh.sample b/launch_phpunit.sh → launch_phpunit.sh.sample
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Setup your testing environment paths
-export SERVER_BASE_DIR=/var/www/html/nextcloud/
-export SERVER_CONFIG_DIR=/var/www/html/nextcloud/config/
+export SERVER_BASE_DIR=/var/www/html/
+export SERVER_CONFIG_DIR=/var/www/html/config/
 export SERVER_CONFIG_FILE=config.php
 
 # Launch the actual tests

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -9,9 +9,17 @@
  * @copyright Sander Brand 2016
  */
 
-require_once __DIR__ . '/../../../tests/bootstrap.php';
+$nc_require_base = getenv('SERVER_BASE_DIR');
+
+if ($nc_require_base) {
+    require_once $nc_require_base . '/tests/bootstrap.php';
+}
+else{
+    require_once __DIR__ . '/../../../tests/bootstrap.php';
+}
+
 require_once __DIR__ . '/../appinfo/autoload.php';
-#require_once __DIR__ . '/db/DatabaseHelperTest.php';
+require_once __DIR__ . '/db/DatabaseHelperTest.php';
 
 
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"