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/codeigniter/core/URI_test.php | |
parent | ed1aa21dcd5312b2884f140be8c0d2ee94379423 (diff) | |
parent | 8f50b6b36cb743be8b70809279e501c20b8e38e2 (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-driver
Diffstat (limited to 'tests/codeigniter/core/URI_test.php')
-rw-r--r-- | tests/codeigniter/core/URI_test.php | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index 40252aa14..e340ddf73 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -1,41 +1,10 @@ <?php -require BASEPATH.'core/URI.php'; - -/** - * Extend the URI class - * - override contructor - * - override CLI detection - */ -class URI_extended extends CI_URI { - - public function __construct() - { - $test = CI_TestCase::instance(); - $cls =& $test->ci_core_class('cfg'); - - // set predictable config values - $test->ci_set_config(array( - 'index_page' => 'index.php', - 'base_url' => 'http://example.com/', - 'subclass_prefix' => 'MY_' - )); - - $this->config = new $cls; - - } - - protected function _is_cli_request() - { - return FALSE; - } -} - class URI_test extends CI_TestCase { public function set_up() { - $this->uri = new URI_extended(); + $this->uri = new Mock_Core_URI(); } // -------------------------------------------------------------------- |