Changeset 55289 for trunk/tests/phpunit/tests/formatting/makeClickable.php

Timestamp:

02/07/2023 06:52:24 PM (2 years ago)

Author:

jorbin

Message:

Comments: Improve rel attribute usage in comments.

Internal links should be followed and it should be easier to modify other rel attributes on comments. This adds a helper function for determining if a URL is internal and also adds some new filters to make it easy to modify rel attributes in comments.

Props thomasplevy, desrosj, sabernhardt, benish74, samiamnot, galbaras, jorbin.

Fixes #53290, #56444.

File:

• trunk/tests/phpunit/tests/formatting/makeClickable.php (modified) (6 diffs)

trunk/tests/phpunit/tests/formatting/makeClickable.php

@@ -109 +109 @@
         );
         $urls_expected = array(
-            '<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>. Alice!',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>, said Alice.',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>; said Alice.',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>: said Alice.',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>) said Alice.',
+            "<a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>. Alice!",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>, said Alice.",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>; said Alice.",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>: said Alice.",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>) said Alice.",
         );
 
@@ -136 +136 @@
         );
         $urls_expected = array(
-            '<a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>.',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>,',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>;',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>:',
-            'There was a spoon named <a href="http://www.wordpress.org" rel="nofollow">http://www.wordpress.org</a>)',
+            "<a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>.",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>,",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>;",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>:",
+            "There was a spoon named <a href='http://www.wordpress.org' rel=\"nofollow\">http://www.wordpress.org</a>)",
         );
 
@@ -218 +218 @@
         );
         $urls_expected = array(
-            'Example: WordPress, test (some text), I love example.com (<a href="http://example.org" rel="nofollow">http://example.org</a>), it is brilliant',
+            'Example: WordPress, test (some text), I love example.com (<a href="http://example.org">http://example.org</a>), it is brilliant',
             'Example: WordPress, test (some text), I love example.com (<a href="http://example.com" rel="nofollow">http://example.com</a>), it is brilliant',
             'Some text followed by a bracketed link with a trailing elipsis (<a href="http://example.com" rel="nofollow">http://example.com</a>)...',
@@ -422 +422 @@
     /**
      * @ticket 48022
+     * @ticket 56444
      * @dataProvider data_add_rel_ugc_in_comments
      */
@@ -439 +440 @@
 
     public function data_add_rel_ugc_in_comments() {
+
+        $home_url_http  = set_url_scheme( home_url(), 'http' );
+        $home_url_https = set_url_scheme( home_url(), 'https' );
+
         return array(
+            // @ticket 48022
             array(
                 'http://wordpress.org',
@@ -446 +452 @@
             array(
                 'www.wordpress.org',
-                '<p><a href="http://www.wordpress.org" rel="nofollow ugc">http://www.wordpress.org</a>',
+                '<p><a href=\'http://www.wordpress.org\' rel="nofollow ugc">http://www.wordpress.org</a>',
+            ),
+            // @ticket 56444
+            array(
+                'www.example.org',
+                '<p><a href=\'http://www.example.org\' rel="nofollow ugc">http://www.example.org</a>',
+            ),
+            array(
+                $home_url_http,
+                '<a href="' . $home_url_http . '" rel="ugc">' . $home_url_http . '</a>',
+            ),
+            array(
+                $home_url_https,
+                '<a href="' . $home_url_https . '" rel="ugc">' . $home_url_https . '</a>',
             ),
         );