From a1d1fc8ede2beca6a06b0963b75fc16bda269674 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Sat, 1 Jul 2017 16:08:44 +0200
Subject: [PATCH] Update phpunit

---
 js/exporters/exporter-csv.js | 2 +-
 phpunit.integration.xml      | 2 +-
 phpunit.xml                  | 6 +++---
 tests/bootstrap.php          | 8 +-------
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/js/exporters/exporter-csv.js b/js/exporters/exporter-csv.js
index 8363a7067..70ec47408 100644
--- a/js/exporters/exporter-csv.js
+++ b/js/exporters/exporter-csv.js
@@ -33,7 +33,7 @@ PassmanExporter.csv = {
 PassmanExporter.csv.export = function (credentials, FileService, EncryptService) {
 	/** global: C_Promise */
 	return new C_Promise(function () {
-		PassmanExporter.getCredentialsWithFiles(credentials, FileService, EncryptService).then((function(data){
+		PassmanExporter.getCredentialsWithFiles(credentials, FileService, EncryptService).then((function(){
 		    var headers = ['label', 'username', 'password', 'email', 'description', 'tags', 'url', 'custom_fields', 'files'];
 		    var file_data = '"' + headers.join('","') + '"\n';
 		    for (var i = 0; i < credentials.length; i++) {
diff --git a/phpunit.integration.xml b/phpunit.integration.xml
index 32cba8afa..9a9c27a68 100644
--- a/phpunit.integration.xml
+++ b/phpunit.integration.xml
@@ -1,7 +1,7 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="integration">
-            <directory>./tests/integration</directory>
+           <!-- <directory>./tests/integration</directory> -->
         </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index cb67e3ce0..3f7962783 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
     <testsuites>
         <testsuite name="unit">
             <directory>./tests/unit</directory>
-            <!--<exclude>./tests/unit/lib/Db</exclude>-->
+            <exclude>./tests/unit/lib/Db</exclude>
         </testsuite>
     </testsuites>
     <filter>
@@ -13,8 +13,8 @@
 
             <!--<file>/path/to/file</file>-->
             <!--<exclude>-->
-                <!--<directory suffix=".php">/path/to/dir</directory>-->
-                <!--<file>/path/to/file</file>-->
+            <!--<directory suffix=".php">/path/to/dir</directory>-->
+            <!--<file>/path/to/file</file>-->
             <!--</exclude>-->
         </whitelist>
 
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f94088623..5bd36a9b8 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -9,14 +9,8 @@
  * @copyright Sander Brand 2016
  */
 
-$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__ . '/../../../tests/bootstrap.php';
 
 require_once __DIR__ . '/../appinfo/autoload.php';
 require_once __DIR__ . '/db/DatabaseHelperTest.php';