summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-01-17 15:37:48 +0100
committerAndrey Andreev <narf@devilix.net>2014-01-17 15:37:48 +0100
commite17ccdb9cefa21df944b416a5461661419263ad0 (patch)
treefeeefa322b042009ed389a2704ef694de0de5515 /tests
parent88cf55bd294e74c71e70406e3a48e722db224f7f (diff)
parent30d5324617ae136c7a91badb6ed8f7de418fd7f5 (diff)
Merge branch 'feature/uri_routing_overhaul' into 'develop'
Diffstat (limited to 'tests')
-rw-r--r--tests/codeigniter/core/URI_test.php28
1 files changed, 10 insertions, 18 deletions
diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php
index 99d79bbd2..6589c1f5a 100644
--- a/tests/codeigniter/core/URI_test.php
+++ b/tests/codeigniter/core/URI_test.php
@@ -26,6 +26,10 @@ class URI_test extends CI_TestCase {
// --------------------------------------------------------------------
+ /*
+
+ This has been moved to the constructor
+
public function test_fetch_uri_string()
{
define('SELF', 'index.php');
@@ -86,9 +90,14 @@ class URI_test extends CI_TestCase {
// uri_protocol: REQUEST_URI
// uri_protocol: CLI
}
+ */
// --------------------------------------------------------------------
+ /*
+
+ This has been moved into _set_uri_string()
+
public function test_explode_segments()
{
// Let's test the function's ability to clean up this mess
@@ -107,7 +116,7 @@ class URI_test extends CI_TestCase {
$this->assertEquals($a, $this->uri->segments);
}
}
-
+ */
// --------------------------------------------------------------------
public function test_filter_uri()
@@ -145,23 +154,6 @@ class URI_test extends CI_TestCase {
// --------------------------------------------------------------------
- public function test_remove_url_suffix()
- {
- $this->uri->config->set_item('url_suffix', '.html');
-
- $this->uri->uri_string = 'controller/method/index.html';
- $this->uri->_remove_url_suffix();
-
- $this->assertEquals($this->uri->uri_string, 'controller/method/index');
-
- $this->uri->uri_string = 'controller/method/index.htmlify.html';
- $this->uri->_remove_url_suffix();
-
- $this->assertEquals($this->uri->uri_string, 'controller/method/index.htmlify');
- }
-
- // --------------------------------------------------------------------
-
public function test_segment()
{
$this->uri->segments = array(1 => 'controller');