From 61a0aee144710228ea30afa672adf530623d35d5 Mon Sep 17 00:00:00 2001 From: Razican Date: Tue, 11 Nov 2014 12:36:21 +0200 Subject: Fixed tests Signed-off-by: Razican --- tests/codeigniter/core/URI_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/codeigniter') diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index b05a385d6..4b1d644e3 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -138,7 +138,7 @@ class URI_test extends CI_TestCase { $str = $this->uri->filter_uri('$destroy_app(foo)'); - $this->assertEquals($str, '$destroy_app(foo)'); + $this->assertEquals($str, '$destroy_app(foo)'); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From bfa233f559a50ee0674a209fa56f866edc814fd9 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 5 Dec 2014 12:00:11 +0200 Subject: Further changes related to issue #47, PR #3323 - Removed a test that was created specifically for the 'convert programmatic characters to entities' feature. - Changed filter_uri() to accept by reference and to not return anything as its only purpose now is to trigger a show_error() call. - Added changelog messages and updated the upgrade instructions. --- tests/codeigniter/core/URI_test.php | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'tests/codeigniter') diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index 4b1d644e3..adb62f6cb 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -119,26 +119,12 @@ class URI_test extends CI_TestCase { */ // -------------------------------------------------------------------- - public function test_filter_uri() + public function test_filter_uri_passing() { $this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-'); - $str_in = 'abc01239~%.:_-'; - $str = $this->uri->filter_uri($str_in); - - $this->assertEquals($str, $str_in); - } - - // -------------------------------------------------------------------- - - public function test_filter_uri_escaping() - { - // ensure escaping even if dodgey characters are permitted - $this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-()$'); - - $str = $this->uri->filter_uri('$destroy_app(foo)'); - - $this->assertEquals($str, '$destroy_app(foo)'); + $str = 'abc01239~%.:_-'; + $this->uri->filter_uri($str); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From 82358c1f2ce5117a21e90f6ec96400535c5f4eed Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 5 Dec 2014 12:03:42 +0200 Subject: Fix a filter_uri() test --- tests/codeigniter/core/URI_test.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/codeigniter') diff --git a/tests/codeigniter/core/URI_test.php b/tests/codeigniter/core/URI_test.php index adb62f6cb..50663d54a 100644 --- a/tests/codeigniter/core/URI_test.php +++ b/tests/codeigniter/core/URI_test.php @@ -135,7 +135,8 @@ class URI_test extends CI_TestCase { $this->uri->config->set_item('enable_query_strings', FALSE); $this->uri->_set_permitted_uri_chars('a-z 0-9~%.:_\-'); - $this->uri->filter_uri('$this()'); + $segment = '$this()'; // filter_uri() accepts by reference + $this->uri->filter_uri($segment); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b From eceebe3bedfd635c41ce2d849bcb32766d1e6cb9 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 15 Dec 2014 17:30:03 +0200 Subject: Remove minifier test --- tests/codeigniter/core/Output_test.php | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'tests/codeigniter') diff --git a/tests/codeigniter/core/Output_test.php b/tests/codeigniter/core/Output_test.php index 0eeb93f7b..a06c17045 100644 --- a/tests/codeigniter/core/Output_test.php +++ b/tests/codeigniter/core/Output_test.php @@ -38,16 +38,6 @@ HTML; // -------------------------------------------------------------------- - public function test_minify() - { - $this->assertEquals( - str_replace(array("\t", "\n"), '', $this->_output_data), - $this->output->minify($this->_output_data) - ); - } - - // -------------------------------------------------------------------- - public function test_get_content_type() { $this->assertEquals('text/html', $this->output->get_content_type()); -- cgit v1.2.3-24-g4f1b From 42bc6d51e15c180f35632d5c03c649225f8dbf74 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 16 Dec 2014 16:16:45 +0200 Subject: Fix #3419 --- tests/codeigniter/core/Config_test.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'tests/codeigniter') diff --git a/tests/codeigniter/core/Config_test.php b/tests/codeigniter/core/Config_test.php index 8e312e361..f125fc6e9 100644 --- a/tests/codeigniter/core/Config_test.php +++ b/tests/codeigniter/core/Config_test.php @@ -205,13 +205,18 @@ class Config_test extends CI_TestCase { 'number' => 42, 'letter' => 'Z' ); + $pkg_dir = 'package'; - $this->ci_vfs_create($file.'.php', 'ci_app_root, - array($pkg_dir, 'config')); - $this->config->_config_paths[] = $this->ci_vfs_path($pkg_dir.'/', APPPATH); + $this->ci_vfs_create( + $file.'.php', + 'ci_app_root, + array($pkg_dir, 'config') + ); + array_unshift($this->config->_config_paths, $this->ci_vfs_path($pkg_dir.'/', APPPATH)); $this->assertTrue($this->config->load($file, TRUE)); $this->assertEquals(array_merge($cfg, $cfg2), $this->config->item($file)); - array_pop($this->config->_config_paths); + array_shift($this->config->_config_paths); // Test graceful fail of invalid file $file = 'badfile'; -- cgit v1.2.3-24-g4f1b From 168ba6c18ca68248d16184c2518666bc19b6d2fb Mon Sep 17 00:00:00 2001 From: Dan Bernardic Date: Sat, 10 Jan 2015 21:11:01 -0600 Subject: Added a unit test for #3464 Signed-off-by: Dan Bernardic --- tests/codeigniter/core/Lang_test.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/codeigniter') diff --git a/tests/codeigniter/core/Lang_test.php b/tests/codeigniter/core/Lang_test.php index d3c7ee1e4..87a71c885 100644 --- a/tests/codeigniter/core/Lang_test.php +++ b/tests/codeigniter/core/Lang_test.php @@ -29,6 +29,11 @@ class Lang_test extends CI_TestCase { $this->assertTrue($this->lang->load('date')); $this->assertEquals('Year', $this->lang->language['date_year']); + // A language other than english + $this->ci_vfs_clone('system/language/english/email_lang.php', 'system/language/german/'); + $this->assertTrue($this->lang->load('email', 'german')); + $this->assertEquals('german', $this->lang->is_loaded['email_lang.php'] ); + // Non-alpha idiom (should act the same as unspecified language) $this->ci_vfs_clone('system/language/english/number_lang.php'); $this->assertTrue($this->lang->load('number')); @@ -56,4 +61,4 @@ class Lang_test extends CI_TestCase { $this->assertFalse($this->lang->line(NULL)); } -} \ No newline at end of file +} -- cgit v1.2.3-24-g4f1b