diff options
author | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-08-10 14:26:57 +0200 |
commit | c4bd43432df03e4f4835c7689c8ed722cd2c3020 (patch) | |
tree | 5603166833d78b0581bbe880adb53b6de085719d /tests/codeigniter/libraries/Form_validation_test.php | |
parent | 488ad40ba334ca506f07bede97724726eac2b27f (diff) | |
parent | 9180a1264dc536c34e5cc8a0e44bb399a8ba484f (diff) |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'tests/codeigniter/libraries/Form_validation_test.php')
-rw-r--r-- | tests/codeigniter/libraries/Form_validation_test.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php index b87ca65ff..0815300e6 100644 --- a/tests/codeigniter/libraries/Form_validation_test.php +++ b/tests/codeigniter/libraries/Form_validation_test.php @@ -8,10 +8,10 @@ class Form_validation_test extends CI_TestCase { // Create a mock loader since load->helper() looks in the wrong directories for unit tests, // We'll use CI_TestCase->helper() instead - $loader = $this->getMock('CI_Loader', array('helper')); + $loader = $this->getMockBuilder('CI_Loader')->setMethods(array('helper'))->getMock(); // Same applies for lang - $lang = $this->getMock('CI_Lang', array('load')); + $lang = $this->getMockBuilder('CI_Lang')->setMethods(array('load'))->getMock(); $this->ci_set_config('charset', 'UTF-8'); $utf8 = new Mock_Core_Utf8(); @@ -259,6 +259,9 @@ class Form_validation_test extends CI_TestCase { // https://github.com/bcit-ci/CodeIgniter/issues/4415 $this->assertTrue($this->form_validation->valid_url('http://[::1]/ipv6')); + // URI scheme case-sensitivity: https://github.com/bcit-ci/CodeIgniter/pull/4758 + $this->assertTrue($this->form_validation->valid_url('HtTp://127.0.0.1/')); + $this->assertFalse($this->form_validation->valid_url('htt://www.codeIgniter.com')); $this->assertFalse($this->form_validation->valid_url('')); $this->assertFalse($this->form_validation->valid_url('code igniter')); |