summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-11-04 21:33:05 -0500
committerFrédéric Guillot <fred@kanboard.net>2014-11-04 21:33:05 -0500
commit135b921db75da5995eab7e36393ecd4d2b0bc66f (patch)
tree46efc60fcf1f9d5c57ab1fb9418c2acfbda0698a /tests
parent850645dd6b22f5b495d1680e0b49540e0ebf9bd3 (diff)
Switch to composer
Diffstat (limited to 'tests')
-rw-r--r--tests/functionals/ApiTest.php5
-rw-r--r--tests/units/Base.php13
2 files changed, 2 insertions, 16 deletions
diff --git a/tests/functionals/ApiTest.php b/tests/functionals/ApiTest.php
index f6e21b55..88807007 100644
--- a/tests/functionals/ApiTest.php
+++ b/tests/functionals/ApiTest.php
@@ -1,9 +1,6 @@
<?php
-require_once __DIR__.'/../../vendor/PicoDb/Database.php';
-require_once __DIR__.'/../../vendor/JsonRPC/Client.php';
-require_once __DIR__.'/../../app/Core/Security.php';
-require_once __DIR__.'/../../app/functions.php';
+require_once __DIR__.'/../../vendor/autoload.php';
class Api extends PHPUnit_Framework_TestCase
{
diff --git a/tests/units/Base.php b/tests/units/Base.php
index 3a46a4ae..cb56060e 100644
--- a/tests/units/Base.php
+++ b/tests/units/Base.php
@@ -1,24 +1,13 @@
<?php
-require __DIR__.'/../../app/Core/Loader.php';
-require __DIR__.'/../../app/helpers.php';
-require __DIR__.'/../../app/functions.php';
+require __DIR__.'/../../vendor/autoload.php';
require __DIR__.'/../../app/constants.php';
use Core\Loader;
use Core\Registry;
-if (version_compare(PHP_VERSION, '5.5.0', '<')) {
- require __DIR__.'/../../vendor/password.php';
-}
-
date_default_timezone_set('UTC');
-$loader = new Loader;
-$loader->setPath('app');
-$loader->setPath('vendor');
-$loader->execute();
-
abstract class Base extends PHPUnit_Framework_TestCase
{
public function setUp()