summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-02 18:13:04 -0500
committerEvan Prodromou <evan@status.net>2009-11-02 18:13:04 -0500
commita2b830392597d88c435baf54ad0df4ecda02dc41 (patch)
tree08f8ddcbcab63de9117ccf82e5477fa0d565bdc6 /tests
parent61419038e5747886357964a7eb3f814761482891 (diff)
parent15d0055c6f2e3b7007a82df40502e15cf5c32a13 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts: classes/User.php
Diffstat (limited to 'tests')
-rw-r--r--tests/URLDetectionTest.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 0cc03ccce..d83f9faf5 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -185,12 +185,12 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
array('http://example.com/path/(foo)/bar',
'<a href="http://example.com/path/(foo)/bar" title="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
array('http://example.com/path/[foo]/bar',
- '<a href="http://example.com/path/[foo]/bar" title="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
+ '<a href="http://example.com/path/" title="http://example.com/path/" rel="external">http://example.com/path/</a>[foo]/bar'),
array('http://example.com/path/foo/(bar)',
'<a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
//Not a valid url - urls cannot contain unencoded square brackets
array('http://example.com/path/foo/[bar]',
- '<a href="http://example.com/path/foo/[bar]" title="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
+ '<a href="http://example.com/path/foo/" title="http://example.com/path/foo/" rel="external">http://example.com/path/foo/</a>[bar]'),
array('Hey, check out my cool site http://example.com okay?',
'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a> okay?'),
array('What about parens (e.g. http://example.com/path/foo/(bar))?',