Changeset 60894

Timestamp:

10/03/2025 11:00:04 AM (4 days ago)

Author:

jorbin

Message:

Tests: Use a dataprovider for some admin-bar tests.

Refactor admin-bar tests to use dataProviers rather than looping through assertions.

See #63167.

File:

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

trunk/tests/phpunit/tests/adminbar.php

@@ -732 +732 @@
      * @ticket 39082
      * @group ms-required
-     */
-    public function test_my_sites_network_menu_for_regular_user() {
+     * @dataProvider data_my_sites_network_menu_items
+     */
+    public function test_my_sites_network_menu_for_regular_user( $id, $cap ) {
         wp_set_current_user( self::$editor_id );
 
@@ -739 +740 @@
 
         $nodes = $wp_admin_bar->get_nodes();
-        foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
-            $this->assertArrayNotHasKey( $id, $nodes, sprintf( 'Menu item %s must not display for a regular user.', $id ) );
-        }
+        $this->assertArrayNotHasKey( $id, $nodes, sprintf( 'Menu item %s must not display for a regular user.', $id ) );
     }
 
@@ -747 +746 @@
      * @ticket 39082
      * @group ms-required
-     */
-    public function test_my_sites_network_menu_for_super_admin() {
+     * @dataProvider data_my_sites_network_menu_items
+     */
+    public function test_my_sites_network_menu_for_super_admin( $id, $cap ) {
         wp_set_current_user( self::$editor_id );
 
@@ -756 +756 @@
 
         $nodes = $wp_admin_bar->get_nodes();
-        foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
-            $this->assertArrayHasKey( $id, $nodes, sprintf( 'Menu item %s must display for a super admin.', $id ) );
-        }
+        $this->assertArrayHasKey( $id, $nodes, sprintf( 'Menu item %s must display for a super admin.', $id ) );
     }
 
@@ -764 +762 @@
      * @ticket 39082
      * @group ms-required
-     */
-    public function test_my_sites_network_menu_for_regular_user_with_network_caps() {
+     * @dataProvider data_my_sites_network_menu_items
+     */
+    public function test_my_sites_network_menu_for_regular_user_with_network_caps( $id, $cap ) {
         global $current_user;
 
@@ -781 +780 @@
 
         $nodes = $wp_admin_bar->get_nodes();
-        foreach ( $this->get_my_sites_network_menu_items() as $id => $cap ) {
-            if ( in_array( $cap, $network_user_caps, true ) ) {
-                $this->assertArrayHasKey( $id, $nodes, sprintf( 'Menu item %1$s must display for a user with the %2$s cap.', $id, $cap ) );
-            } else {
-                $this->assertArrayNotHasKey( $id, $nodes, sprintf( 'Menu item %1$s must not display for a user without the %2$s cap.', $id, $cap ) );
-            }
+        if ( in_array( $cap, $network_user_caps, true ) ) {
+            $this->assertArrayHasKey( $id, $nodes, sprintf( 'Menu item %1$s must display for a user with the %2$s cap.', $id, $cap ) );
+        } else {
+            $this->assertArrayNotHasKey( $id, $nodes, sprintf( 'Menu item %1$s must not display for a user without the %2$s cap.', $id, $cap ) );
         }
     }
 
-    private function get_my_sites_network_menu_items() {
+    /**
+     * Data provider for test_my_sites_network_menu_for_regular_user() and
+     * test_my_sites_network_menu_for_super_admin().
+     *
+     * @return array {
+     *     @type array {
+     *         @type string $id  The ID of the menu item.
+     *         @type string $cap The capability required to see the menu item.
+     *     }
+     * }
+     */
+    public function data_my_sites_network_menu_items() {
         return array(
-            'my-sites-super-admin' => 'manage_network',
-            'network-admin'        => 'manage_network',
-            'network-admin-d'      => 'manage_network',
-            'network-admin-s'      => 'manage_sites',
-            'network-admin-u'      => 'manage_network_users',
-            'network-admin-t'      => 'manage_network_themes',
-            'network-admin-p'      => 'manage_network_plugins',
-            'network-admin-o'      => 'manage_network_options',
+            array( 'my-sites-super-admin', 'manage_network' ),
+            array( 'network-admin', 'manage_network' ),
+            array( 'network-admin-d', 'manage_network' ),
+            array( 'network-admin-s', 'manage_sites' ),
+            array( 'network-admin-u', 'manage_network_users' ),
+            array( 'network-admin-t', 'manage_network_themes' ),
+            array( 'network-admin-p', 'manage_network_plugins' ),
+            array( 'network-admin-o', 'manage_network_options' ),
         );
     }