Changeset 52396

Timestamp:

12/21/2021 12:10:26 AM (22 months ago)

Author:

hellofromTonya

Message:

General: Fix 'rel' argument in Tests_Functions_wpListBookmarks test datasets.

wp_list_bookmarks() arguments include 'link_rel', but not 'rel'. This commit fixes this argument in the test datasets. It also adds an expected 'rel=""' result check, i.e. instead of only checking for 'noopener'.

Follow-up to [52395].

Props davidbinda.
Fixes #53839.

File:

• trunk/tests/phpunit/tests/bookmark/wpListBookmarks.php (modified) (4 diffs)

trunk/tests/phpunit/tests/bookmark/wpListBookmarks.php

@@ -16 +16 @@
      * @ticket 53839
      *
-     * @param array $args The arguments to create the bookmark.
+     * @param array $args      The arguments to create the bookmark.
+     * @param string $expected Expected string to test.
      */
-    public function test_wp_list_bookmarks_adds_noopener( $args ) {
-        $bookmark = self::factory()->bookmark->create( $args );
-        $this->assertStringContainsString( 'noopener', wp_list_bookmarks( 'echo=0' ) );
+    public function test_wp_list_bookmarks_adds_noopener( $args, $expected ) {
+        self::factory()->bookmark->create( $args );
+        $this->assertStringContainsString( $expected, wp_list_bookmarks( 'echo=0' ) );
     }
 
@@ -31 +32 @@
         return array(
             'target as "_blank"'                         => array(
-                'args' => array(
+                'args'     => array(
                     'link_name'   => 'With _blank',
                     'link_url'    => 'https://www.wordpress.org',
                     'link_target' => '_blank',
                 ),
+                'expected' => 'rel="noopener"',
             ),
             'target as "_blank" and a link relationship' => array(
-                'args' => array(
+                'args'     => array(
                     'link_name'   => 'With _blank and a link relationship',
                     'link_url'    => 'https://www.wordpress.org',
                     'link_target' => '_blank',
-                    'rel'         => 'me',
+                    'link_rel'    => 'me',
                 ),
+                'expected' => 'rel="me noopener"',
             ),
             'target as "_top"'                           => array(
-                'args' => array(
+                'args'     => array(
                     'link_name'   => 'With _top',
                     'link_url'    => 'https://www.wordpress.org',
                     'link_target' => '_top',
                 ),
+                'expected' => 'rel="noopener"',
             ),
             'target as "_top" and a link relationship'   => array(
-                'args' => array(
+                'args'     => array(
                     'link_name'   => 'With _top and a link relationship',
                     'link_url'    => 'https://www.wordpress.org',
                     'link_target' => '_top',
-                    'rel'         => 'me',
+                    'link_rel'    => 'me',
                 ),
+                'expected' => 'rel="me noopener"',
             ),
         );
@@ -73 +78 @@
      */
     public function test_wp_list_bookmarks_does_not_add_noopener( $args ) {
-        $bookmark = self::factory()->bookmark->create( $args );
+        self::factory()->bookmark->create( $args );
         $this->assertStringNotContainsString( 'noopener', wp_list_bookmarks( 'echo=0' ) );
     }
@@ -96 +101 @@
                     'link_url'    => 'https://www.wordpress.org',
                     'link_target' => '_none',
-                    'rel'         => 'me',
+                    'link_rel'    => 'me',
                 ),
             ),