diff options
author | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2016-02-09 22:35:08 +0100 |
commit | 477e08f1d6726809660e4841f389493541f7bc07 (patch) | |
tree | 785b12b53c5e46e317def1768558f33445ab2b1f /tests/codeigniter/libraries | |
parent | 2342256c076502cbaca86fcff2a1dbbfc49a1900 (diff) | |
parent | 39967987ebcc79fc867c1f7fa8d69cc65801f594 (diff) |
Merge branch '3.0-stable' into develop
Fixed conflicts:
user_guide_src/source/overview/at_a_glance.rst
Diffstat (limited to 'tests/codeigniter/libraries')
-rw-r--r-- | tests/codeigniter/libraries/Form_validation_test.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/codeigniter/libraries/Form_validation_test.php b/tests/codeigniter/libraries/Form_validation_test.php index 65a3bbff7..f455b9146 100644 --- a/tests/codeigniter/libraries/Form_validation_test.php +++ b/tests/codeigniter/libraries/Form_validation_test.php @@ -231,6 +231,13 @@ class Form_validation_test extends CI_TestCase { $this->assertTrue($this->form_validation->valid_url('www.codeigniter.com')); $this->assertTrue($this->form_validation->valid_url('http://codeigniter.com')); + // https://bugs.php.net/bug.php?id=51192 + $this->assertTrue($this->form_validation->valid_url('http://accept-dashes.tld')); + $this->assertFalse($this->form_validation->valid_url('http://reject_underscores.tld')); + + // https://github.com/bcit-ci/CodeIgniter/issues/4415 + $this->assertTrue($this->form_validation->valid_url('http://[::1]/ipv6')); + $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')); |