diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-29 10:36:14 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-29 10:36:14 +0200 |
| commit | 5b46f42d654e7474a47ecfd9f7dafece98ee668e (patch) | |
| tree | ba1641fa43469ea3b58c2b1904de9b68c750d26a /tests/Bootstrap.php | |
| parent | 8aea4f49c81199661d3f6e49ff6142b886ea7226 (diff) | |
| parent | 38b2a256758ee8184d354cbdb0eac467118af36b (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
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 |