From 135b921db75da5995eab7e36393ecd4d2b0bc66f Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Tue, 4 Nov 2014 21:33:05 -0500
Subject: Switch to composer

---
 tests/functionals/ApiTest.php |  5 +----
 tests/units/Base.php          | 13 +------------
 2 files changed, 2 insertions(+), 16 deletions(-)

(limited to 'tests')

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()
-- 
cgit v1.2.3