diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:21:39 +0200 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-04-03 19:21:39 +0200 |
commit | 320d37c090cbc1497d3951f64da1c16e86bae609 (patch) | |
tree | 51e1bf36e4d63e233e0b9b550420805d65548945 /tests/codeigniter/core/URI_test.php | |
parent | 31cf46eaec3b4613d5b46f9caed8bdd346b581cc (diff) | |
parent | 78f55772adb86b48d0d50572545c24c18f528ff9 (diff) |
Merge upstream branch
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(); } // -------------------------------------------------------------------- |