diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-28 13:44:35 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-28 13:44:35 +0200 |
| commit | 26c708514e3ca04a1c373efd166b5c17c31e3796 (patch) | |
| tree | 8c2241630f236733da08770bcbcf9d17461a0f78 /tests/Bootstrap.php | |
| parent | ed1aa21dcd5312b2884f140be8c0d2ee94379423 (diff) | |
| parent | 8f50b6b36cb743be8b70809279e501c20b8e38e2 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driver
Diffstat (limited to 'tests/Bootstrap.php')
| -rw-r--r-- | tests/Bootstrap.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index 39c24b219..9f89d1be8 100644 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -6,16 +6,16 @@ error_reporting(E_ALL | E_STRICT); $dir = realpath(dirname(__FILE__)); - // Path constants define('PROJECT_BASE', realpath($dir.'/../').'/'); define('BASEPATH', PROJECT_BASE.'system/'); define('APPPATH', PROJECT_BASE.'application/'); define('VIEWPATH', PROJECT_BASE.''); - // Prep our test environment -require_once $dir.'/lib/common.php'; -require_once $dir.'/lib/ci_testcase.php'; +require_once 'vfsStream/vfsStream.php'; +include_once $dir.'/mocks/core/common.php'; +include_once $dir.'/mocks/autoloader.php'; +spl_autoload_register('autoload'); unset($dir);
\ No newline at end of file |