summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-03 17:09:01 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-03 17:09:01 +0100
commitcdac248e9cf7a8ea3ed426f189bb52254800bc2a (patch)
tree9a3c9cbb5fe2761c2c9469c861b95414eb9e3151 /tests
parent28daadeca8ebc889fd799ed8bb58293ebeb4fabd (diff)
It appears to break get_instance()->*_package_path*() usage which is very common. Need to figure out how to resolve this.
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/core/Loader_test.php2
-rw-r--r--tests/mocks/ci_testcase.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/codeigniter/core/Loader_test.php b/tests/codeigniter/core/Loader_test.php
index be223f97d..ecc5ca933 100644
--- a/tests/codeigniter/core/Loader_test.php
+++ b/tests/codeigniter/core/Loader_test.php
@@ -493,7 +493,7 @@ class Loader_test extends CI_TestCase {
);
$this->ci_vfs_create('autoload', '<?php $autoload = '.var_export($cfg, TRUE).';', $this->ci_app_root, 'config');
- $this->load->__construct();
+ $this->load->initialize();
// Verify path
$this->assertContains($path, $this->load->get_package_paths());
diff --git a/tests/mocks/ci_testcase.php b/tests/mocks/ci_testcase.php
index 2d0a26830..f16492945 100644
--- a/tests/mocks/ci_testcase.php
+++ b/tests/mocks/ci_testcase.php
@@ -39,8 +39,6 @@ class CI_TestCase extends PHPUnit_Framework_TestCase {
$this->ci_app_root = vfsStream::newDirectory('application')->at($this->ci_vfs_root);
$this->ci_base_root = vfsStream::newDirectory('system')->at($this->ci_vfs_root);
$this->ci_view_root = vfsStream::newDirectory('views')->at($this->ci_app_root);
- vfsStream::newDirectory('config')->at($this->ci_app_root);
- $this->ci_vfs_clone('application/config/autoload.php');
if (method_exists($this, 'set_up'))
{