Merge pull request #1406 from kauron/master

Fix test execution paths

Makefile

@@ -113,5 +113,5 @@ appstore: clean lint build-js-production
 
 .PHONY: test
 test: composer
-	$(CURDIR)/vendor/phpunit/phpunit/phpunit --coverage-clover clover.xml -c phpunit.xml
+	$(CURDIR)/vendor/phpunit/phpunit/phpunit --coverage-clover clover.xml -c tests/phpunit.xml
 	$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml

tests/bootstrap.php

@@ -21,5 +21,5 @@
  *
  */
 
-require_once __DIR__ . '/../../../tests/bootstrap.php';
+require_once __DIR__ . '/../../../lib/base.php';
 require_once __DIR__ . '/../vendor/autoload.php';

tests/phpunit.xml

@@ -1,4 +1,4 @@
-<phpunit bootstrap="../../../tests/bootstrap.php" colors="true">
+<phpunit bootstrap="./bootstrap.php" colors="true">
     <filter>
         <whitelist>
             <directory suffix=".php">lib</directory>