Changeset 55102 for trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

Timestamp:

01/19/2023 09:46:58 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correct additional_field_get_callback() parameters in some REST API tests.

The second parameter passed to get_callback in WP_REST_Controller::add_additional_fields_to_object() is the field name, not the request details.

Includes moving the get_callback and update_callback helper functions next to the tests they are used in.

Follow-up to [38832], [43768].

See #56793.

File:

• trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php (modified) (2 diffs)

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -1679 +1679 @@
     }
 
-    public function test_search_item_by_filename() {
-        $id1 = self::factory()->attachment->create_object(
-            self::$test_file,
-            0,
-            array(
-                'post_mime_type' => 'image/jpeg',
-            )
-        );
-        $id2 = self::factory()->attachment->create_object(
-            self::$test_file2,
-            0,
-            array(
-                'post_mime_type' => 'image/png',
-            )
-        );
-
-        $filename = wp_basename( self::$test_file2 );
-
-        $request = new WP_REST_Request( 'GET', '/wp/v2/media' );
-        $request->set_param( 'search', $filename );
-        $response = rest_get_server()->dispatch( $request );
-        $data     = $response->get_data();
-
-        $this->assertCount( 1, $data );
-        $this->assertSame( $id2, $data[0]['id'] );
-        $this->assertSame( 'image/png', $data[0]['mime_type'] );
-    }
-
-    public function additional_field_get_callback( $object, $request ) {
+    public function additional_field_get_callback( $object, $field_name ) {
         return 123;
     }
@@ -1715 +1687 @@
             return new WP_Error( 'rest_invalid_param', 'Testing an error.', array( 'status' => 400 ) );
         }
+    }
+
+    public function test_search_item_by_filename() {
+        $id1 = self::factory()->attachment->create_object(
+            self::$test_file,
+            0,
+            array(
+                'post_mime_type' => 'image/jpeg',
+            )
+        );
+        $id2 = self::factory()->attachment->create_object(
+            self::$test_file2,
+            0,
+            array(
+                'post_mime_type' => 'image/png',
+            )
+        );
+
+        $filename = wp_basename( self::$test_file2 );
+
+        $request = new WP_REST_Request( 'GET', '/wp/v2/media' );
+        $request->set_param( 'search', $filename );
+        $response = rest_get_server()->dispatch( $request );
+        $data     = $response->get_data();
+
+        $this->assertCount( 1, $data );
+        $this->assertSame( $id2, $data[0]['id'] );
+        $this->assertSame( 'image/png', $data[0]['mime_type'] );
     }