aboutsummaryrefslogtreecommitdiffstats
path: root/tests/phpunit/includes/HttpTest.php
diff options
context:
space:
mode:
authorChad Horohoe <demon@users.mediawiki.org>2011-06-16 02:58:00 +0000
committerChad Horohoe <demon@users.mediawiki.org>2011-06-16 02:58:00 +0000
commit860cdbc0ff81626cdaedc924eb3a261b786b504c (patch)
treee05f227d7b64159993ecf17faf3644628692a1be /tests/phpunit/includes/HttpTest.php
parent9293607412ae14fcb0ff9978698bdc83a698c978 (diff)
downloadmediawikicore-860cdbc0ff81626cdaedc924eb3a261b786b504c.tar.gz
mediawikicore-860cdbc0ff81626cdaedc924eb3a261b786b504c.zip
Followup to r89452, remove ftp test cases since Http::isValidUri() doesn't do ftp anymore
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/90192
Diffstat (limited to 'tests/phpunit/includes/HttpTest.php')
-rw-r--r--tests/phpunit/includes/HttpTest.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/phpunit/includes/HttpTest.php b/tests/phpunit/includes/HttpTest.php
index d54e7f4fa7a1..2877d4d712db 100644
--- a/tests/phpunit/includes/HttpTest.php
+++ b/tests/phpunit/includes/HttpTest.php
@@ -558,10 +558,9 @@ class HttpTest extends MediaWikiTestCase {
return array(
array( false, '¿non sens before!! http://a', 'Allow anything before URI' ),
- # (ftp|http|https) - only three schemes allowed
+ # (http|https) - only three schemes allowed
array( true, 'http://www.example.org/' ),
array( true, 'https://www.example.org/' ),
- array( true, 'ftp://www.example.org/' ),
array( true, 'http://www.example.org', 'URI without directory' ),
array( true, 'http://a', 'Short name' ),
array( true, 'http://étoile', 'Allow UTF-8 in hostname' ), # 'étoile' is french for 'star'
@@ -590,8 +589,6 @@ class HttpTest extends MediaWikiTestCase {
array( true, 'https://example.org:80/' ),
array( true, 'http://example.org:443/' ),
array( true, 'https://example.org:443/' ),
- array( true, 'ftp://example.org:1/', 'Minimum' ),
- array( true, 'ftp://example.org:65535/', 'Maximum port number' ),
# Part after the hostname is / or / with something else
array( true, 'http://example/#' ),