Changeset 60834 for branches/5.2/tests/phpunit/tests/customize/nav-menus.php

Timestamp:

09/30/2025 05:05:21 PM (11 months ago)

Author:

desrosj

Message:

Grouped backports for the 5.2 branch.

• REST API: Increase the specificity of capability checks for collections when the edit context is in use.
• Menus: Prevent HTML in menu item titles from being rendered unexpectedly.

Merges [60814], [60815], [60816] to the 5.2 branch.

Props andraganescu, desrosj, ehti, hurayraiit, iandunn, joehoyle, johnbillion, jorbin, mnelson4, noisysocks, peterwilsoncc, phillsav, rmccue, timothyblynjacobs, vortfu, westonruter , whyisjake, zieladam.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/customize/nav-menus.php (modified) (7 diffs)

branches/5.2/tests/phpunit/tests/customize/nav-menus.php

@@ -145 +145 @@
                 // Home is included in menu items when page is zero.
                 $items = $menus->load_available_items_query( 'post_type', 'page', 0 );
-                $this->assertContains( $expected, $items );
+                $this->assertContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
 
                 // Home is not included in menu items when page is larger than zero.
                 $items = $menus->load_available_items_query( 'post_type', 'page', 1 );
                 $this->assertNotEmpty( $items );
-                $this->assertNotContains( $expected, $items );
+                $this->assertNotContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
         }
 
@@ -162 +162 @@
 
                 // Create page.
-                $post_id = self::factory()->post->create( array( 'post_title' => 'Post Title' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Post <strong>Strong</strong> Title' ) );
 
                 // Create pages.
@@ -169 +169 @@
                 // Expected menu item array.
                 $expected = array(
-                        'id'         => "post-{$post_id}",
-                        'title'      => 'Post Title',
-                        'type'       => 'post_type',
-                        'type_label' => 'Post',
-                        'object'     => 'post',
-                        'object_id'  => intval( $post_id ),
-                        'url'        => get_permalink( intval( $post_id ) ),
+                        'id'             => "post-{$post_id}",
+                        'title'          => 'Post <strong>Strong</strong> Title',
+                        'original_title' => 'Post <strong>Strong</strong> Title',
+                        'type'           => 'post_type',
+                        'type_label'     => 'Post',
+                        'object'         => 'post',
+                        'object_id'      => (int) $post_id,
+                        'url'            => get_permalink( (int) $post_id ),
                 );
 
                 // Offset the query and get the second page of menu items.
                 $items = $menus->load_available_items_query( 'post_type', 'post', 1 );
-                $this->assertContains( $expected, $items );
+                $this->assertContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
         }
 
@@ -201 +202 @@
                 // Expected menu item array.
                 $expected = array(
-                        'id'         => "post-{$page_id}",
-                        'title'      => 'Page Title',
-                        'type'       => 'post_type',
-                        'type_label' => 'Page',
-                        'object'     => 'page',
-                        'object_id'  => intval( $page_id ),
-                        'url'        => get_permalink( intval( $page_id ) ),
+                        'id'             => "post-{$page_id}",
+                        'title'          => 'Page Title',
+                        'original_title' => 'Page Title',
+                        'type'           => 'post_type',
+                        'type_label'     => 'Page',
+                        'object'         => 'page',
+                        'object_id'      => (int) $page_id,
+                        'url'            => get_permalink( (int) $page_id ),
                 );
 
                 $items = $menus->load_available_items_query( 'post_type', 'page', 0 );
-                $this->assertContains( $expected, $items );
+                $this->assertContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
         }
 
@@ -227 +229 @@
                 // Expected menu item array.
                 $expected = array(
-                        'id'         => "post-{$post_id}",
-                        'title'      => 'Post Title',
-                        'type'       => 'post_type',
-                        'type_label' => 'Post',
-                        'object'     => 'post',
-                        'object_id'  => intval( $post_id ),
-                        'url'        => get_permalink( intval( $post_id ) ),
+                        'id'             => "post-{$post_id}",
+                        'title'          => 'Post Title',
+                        'original_title' => 'Post Title',
+                        'type'           => 'post_type',
+                        'type_label'     => 'Post',
+                        'object'         => 'post',
+                        'object_id'      => (int) $post_id,
+                        'url'            => get_permalink( (int) $post_id ),
                 );
 
                 $items = $menus->load_available_items_query( 'post_type', 'post', 0 );
-                $this->assertContains( $expected, $items );
+                $this->assertContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
         }
 
@@ -253 +256 @@
                 // Expected menu item array.
                 $expected = array(
-                        'id'         => "term-{$term_id}",
-                        'title'      => 'Term Title',
-                        'type'       => 'taxonomy',
-                        'type_label' => 'Category',
-                        'object'     => 'category',
-                        'object_id'  => intval( $term_id ),
-                        'url'        => get_term_link( intval( $term_id ), 'category' ),
+                        'id'             => "term-{$term_id}",
+                        'title'          => 'Term Title',
+                        'original_title' => 'Term Title',
+                        'type'           => 'taxonomy',
+                        'type_label'     => 'Category',
+                        'object'         => 'category',
+                        'object_id'      => (int) $term_id,
+                        'url'            => get_term_link( (int) $term_id, 'category' ),
                 );
 
                 $items = $menus->load_available_items_query( 'taxonomy', 'category', 0 );
-                $this->assertContains( $expected, $items );
+                $this->assertContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
         }
 
@@ -288 +292 @@
 
                 $items = $menus->load_available_items_query( 'custom_type', 'custom_object', 0 );
-                $this->assertContains( $expected, $items );
+                $this->assertContains( $expected, $items, "Items:\n" . var_export( $items, true ) );
         }