diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-11-05 11:56:27 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-11-05 11:56:27 -0700 |
| commit | 12599e74e44cd9d2ee2c7dbc8b4950fd54aca789 (patch) | |
| tree | 8f286b66b4d7eabdcd6c4a2c88249771853168a6 /js/tests | |
| parent | 03604d683478ddbcf07fd280962cc6aba584701f (diff) | |
| parent | c466a2d2306011b18d7d5f9a1bca0eae5560f980 (diff) | |
| download | elgg-12599e74e44cd9d2ee2c7dbc8b4950fd54aca789.tar.gz elgg-12599e74e44cd9d2ee2c7dbc8b4950fd54aca789.tar.bz2 | |
Merge pull request #88 from sembrestels/t3976
Refs #3976. Implements the fix for #3747 from PHP in elgg.normalize_url() js function.
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/ElggLibTest.js | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js index dd0267c5c..688a1016c 100644 --- a/js/tests/ElggLibTest.js +++ b/js/tests/ElggLibTest.js @@ -73,12 +73,34 @@ ElggLibTest.prototype.testNormalizeUrl = function() { [ ['', elgg.config.wwwroot], - ['test', elgg.config.wwwroot + 'test'], - ['http://google.com', 'http://google.com'], + ['http://example.com', 'http://example.com'], + ['https://example.com', 'https://example.com'], + ['http://example-time.com', 'http://example-time.com'], ['//example.com', '//example.com'], - ['/page', elgg.config.wwwroot + 'page'], - ['mod/plugin/index.php', elgg.config.wwwroot + 'mod/plugin/index.php'], + + ['ftp://example.com/file', 'ftp://example.com/file', + ['mailto:brett@elgg.org', 'mailto:brett@elgg.org', + ['javascript:alert("test")', 'javascript:alert("test")', + ['app://endpoint', 'app://endpoint', + + ['example.com', 'http://example.com', + ['example.com/subpage', 'http://example.com/subpage', + + ['page/handler', elgg.config.wwwroot + 'page/handler', + ['page/handler?p=v&p2=v2', elgg.config.wwwroot + 'page/handler?p=v&p2=v2', + ['mod/plugin/file.php', elgg.config.wwwroot + 'mod/plugin/file.php', + ['mod/plugin/file.php?p=v&p2=v2', elgg.config.wwwroot + 'mod/plugin/file.php?p=v&p2=v2', + ['rootfile.php', elgg.config.wwwroot + 'rootfile.php', + ['rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2', + + ['/page/handler', elgg.config.wwwroot + 'page/handler', + ['/page/handler?p=v&p2=v2', elgg.config.wwwroot + 'page/handler?p=v&p2=v2', + ['/mod/plugin/file.php', elgg.config.wwwroot + 'mod/plugin/file.php', + ['/mod/plugin/file.php?p=v&p2=v2', elgg.config.wwwroot + 'mod/plugin/file.php?p=v&p2=v2', + ['/rootfile.php', elgg.config.wwwroot + 'rootfile.php', + ['/rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2', + ].forEach(function(args) { assertEquals(args[1], elgg.normalize_url(args[0])); }); -};
\ No newline at end of file +}; |