From: Eloy Lafuente <stronk7@moodle.org>
Date: Mon, 30 Nov 2009 15:21:29 +0000 (+0000)
Subject: MDL-20826 convert_urls_into_links() - target="_blank" is out in 2.0 (XHTML I guess).
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b9ad17beb68fea63254cdbd5e4ab8809d63708f4;p=moodle.git

MDL-20826 convert_urls_into_links() - target="_blank" is out in 2.0 (XHTML I guess).
Adjusting tests for that.
---

diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php
index bb35e7f9b6..dfb6fe48d6 100644
--- a/lib/simpletest/testweblib.php
+++ b/lib/simpletest/testweblib.php
@@ -136,30 +136,30 @@ class web_test extends UnitTestCase {
 
     function test_convert_urls_into_links() {
         $texts = array (
-                     'URL: http://moodle.org/s/i=1&j=2' => 'URL: <a href="http://moodle.org/s/i=1&j=2" target="_blank">http://moodle.org/s/i=1&j=2</a>',
-                     'URL: www.moodle.org/s/i=1&amp;j=2' => 'URL: <a href="http://www.moodle.org/s/i=1&amp;j=2" target="_blank">www.moodle.org/s/i=1&amp;j=2</a>',
-                     'URL: https://moodle.org/s/i=1&j=2' => 'URL: <a href="https://moodle.org/s/i=1&j=2" target="_blank">https://moodle.org/s/i=1&j=2</a>',
-                     'URL: http://moodle.org:8080/s/i=1' => 'URL: <a href="http://moodle.org:8080/s/i=1" target="_blank">http://moodle.org:8080/s/i=1</a>',
-                     'http://moodle.org - URL' => '<a href="http://moodle.org" target="_blank">http://moodle.org</a> - URL',
-                     'www.moodle.org - URL' => '<a href="http://www.moodle.org" target="_blank">www.moodle.org</a> - URL',
-                     '(http://moodle.org) - URL' => '(<a href="http://moodle.org" target="_blank">http://moodle.org</a>) - URL',
-                     '(www.moodle.org) - URL' => '(<a href="http://www.moodle.org" target="_blank">www.moodle.org</a>) - URL',
-                     '[http://moodle.org] - URL' => '[<a href="http://moodle.org" target="_blank">http://moodle.org</a>] - URL',
-                     '[www.moodle.org] - URL' => '[<a href="http://www.moodle.org" target="_blank">www.moodle.org</a>] - URL',
-                     '[http://moodle.org/main#anchor] - URL' => '[<a href="http://moodle.org/main#anchor" target="_blank">http://moodle.org/main#anchor</a>] - URL',
-                     '[www.moodle.org/main#anchor] - URL' => '[<a href="http://www.moodle.org/main#anchor" target="_blank">www.moodle.org/main#anchor</a>] - URL',
-                     'URL: http://cc.org/url_(withpar)_go/?i=2' => 'URL: <a href="http://cc.org/url_(withpar)_go/?i=2" target="_blank">http://cc.org/url_(withpar)_go/?i=2</a>',
-                     'URL: www.cc.org/url_(withpar)_go/?i=2' => 'URL: <a href="http://www.cc.org/url_(withpar)_go/?i=2" target="_blank">www.cc.org/url_(withpar)_go/?i=2</a>',
-                     'URL: http://cc.org/url_(with)_(par)_go/?i=2' => 'URL: <a href="http://cc.org/url_(with)_(par)_go/?i=2" target="_blank">http://cc.org/url_(with)_(par)_go/?i=2</a>',
-                     'URL: www.cc.org/url_(with)_(par)_go/?i=2' => 'URL: <a href="http://www.cc.org/url_(with)_(par)_go/?i=2" target="_blank">www.cc.org/url_(with)_(par)_go/?i=2</a>',
+                     'URL: http://moodle.org/s/i=1&j=2' => 'URL: <a href="http://moodle.org/s/i=1&j=2">http://moodle.org/s/i=1&j=2</a>',
+                     'URL: www.moodle.org/s/i=1&amp;j=2' => 'URL: <a href="http://www.moodle.org/s/i=1&amp;j=2">www.moodle.org/s/i=1&amp;j=2</a>',
+                     'URL: https://moodle.org/s/i=1&j=2' => 'URL: <a href="https://moodle.org/s/i=1&j=2">https://moodle.org/s/i=1&j=2</a>',
+                     'URL: http://moodle.org:8080/s/i=1' => 'URL: <a href="http://moodle.org:8080/s/i=1">http://moodle.org:8080/s/i=1</a>',
+                     'http://moodle.org - URL' => '<a href="http://moodle.org">http://moodle.org</a> - URL',
+                     'www.moodle.org - URL' => '<a href="http://www.moodle.org">www.moodle.org</a> - URL',
+                     '(http://moodle.org) - URL' => '(<a href="http://moodle.org">http://moodle.org</a>) - URL',
+                     '(www.moodle.org) - URL' => '(<a href="http://www.moodle.org">www.moodle.org</a>) - URL',
+                     '[http://moodle.org] - URL' => '[<a href="http://moodle.org">http://moodle.org</a>] - URL',
+                     '[www.moodle.org] - URL' => '[<a href="http://www.moodle.org">www.moodle.org</a>] - URL',
+                     '[http://moodle.org/main#anchor] - URL' => '[<a href="http://moodle.org/main#anchor">http://moodle.org/main#anchor</a>] - URL',
+                     '[www.moodle.org/main#anchor] - URL' => '[<a href="http://www.moodle.org/main#anchor">www.moodle.org/main#anchor</a>] - URL',
+                     'URL: http://cc.org/url_(withpar)_go/?i=2' => 'URL: <a href="http://cc.org/url_(withpar)_go/?i=2">http://cc.org/url_(withpar)_go/?i=2</a>',
+                     'URL: www.cc.org/url_(withpar)_go/?i=2' => 'URL: <a href="http://www.cc.org/url_(withpar)_go/?i=2">www.cc.org/url_(withpar)_go/?i=2</a>',
+                     'URL: http://cc.org/url_(with)_(par)_go/?i=2' => 'URL: <a href="http://cc.org/url_(with)_(par)_go/?i=2">http://cc.org/url_(with)_(par)_go/?i=2</a>',
+                     'URL: www.cc.org/url_(with)_(par)_go/?i=2' => 'URL: <a href="http://www.cc.org/url_(with)_(par)_go/?i=2">www.cc.org/url_(with)_(par)_go/?i=2</a>',
                      'URL: <a href="http://moodle.org">http://moodle.org</a>' => 'URL: <a href="http://moodle.org">http://moodle.org</a>',
                      'URL: <a href="http://moodle.org">www.moodle.org</a>' => 'URL: <a href="http://moodle.org">www.moodle.org</a>',
                      'URL: <a href="http://moodle.org"> http://moodle.org</a>' => 'URL: <a href="http://moodle.org"> http://moodle.org</a>',
                      'URL: <a href="http://moodle.org"> www.moodle.org</a>' => 'URL: <a href="http://moodle.org"> www.moodle.org</a>',
-                     'URL: http://moodle.org/s/i=1&j=2.' => 'URL: <a href="http://moodle.org/s/i=1&j=2" target="_blank">http://moodle.org/s/i=1&j=2</a>.',
-                     'URL: www.moodle.org/s/i=1&amp;j=2.' => 'URL: <a href="http://www.moodle.org/s/i=1&amp;j=2" target="_blank">www.moodle.org/s/i=1&amp;j=2</a>.',
-                     'URL: http://moodle.org)<br />' => 'URL: <a href="http://moodle.org" target="_blank">http://moodle.org</a>)<br />',
-                     'URL: <p>text www.moodle.org&lt;/p> text' => 'URL: <p>text <a href="http://www.moodle.org" target="_blank">www.moodle.org</a>&lt;/p> text'
+                     'URL: http://moodle.org/s/i=1&j=2.' => 'URL: <a href="http://moodle.org/s/i=1&j=2">http://moodle.org/s/i=1&j=2</a>.',
+                     'URL: www.moodle.org/s/i=1&amp;j=2.' => 'URL: <a href="http://www.moodle.org/s/i=1&amp;j=2">www.moodle.org/s/i=1&amp;j=2</a>.',
+                     'URL: http://moodle.org)<br />' => 'URL: <a href="http://moodle.org">http://moodle.org</a>)<br />',
+                     'URL: <p>text www.moodle.org&lt;/p> text' => 'URL: <p>text <a href="http://www.moodle.org">www.moodle.org</a>&lt;/p> text'
                  );
         foreach ($texts as $text => $correctresult) {
             $failedmsg = "Testing text: \"$text\": %s";