Changeset 54534 for branches/6.0/tests/phpunit/tests/query/search.php

Timestamp:

10/17/2022 12:24:45 PM (4 years ago)

Author:

audrasjb

Message:

Media: Refactor search by filename within the admin.

Props vortfu, xknown, peterwilsoncc, paulkevan.
Merges [54524] to the 6.0 branch.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/query/search.php (modified) (5 diffs)

branches/6.0/tests/phpunit/tests/query/search.php

@@ -455 +455 @@
 
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type a string value.
@@ -485 +485 @@
 
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image2.png', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type an array value.
@@ -544 +544 @@
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image4.png', true );
                 add_post_meta( $attachment, '_test_meta_key', 'value', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type a string value.
@@ -584 +584 @@
 
                 add_post_meta( $attachment, '_wp_attached_file', 'some-image5.png', true );
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 
                 // Pass post_type a string value.
@@ -609 +609 @@
          * @ticket 22744
          */
-        public function test_filter_query_attachment_filenames_unhooks_itself() {
-                add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
-
-                apply_filters(
-                        'posts_clauses',
-                        array(
-                                'where'    => '',
-                                'groupby'  => '',
-                                'join'     => '',
-                                'orderby'  => '',
-                                'distinct' => '',
-                                'fields'   => '',
-                                'limit'    => '',
-                        )
-                );
-
-                $result = has_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
-
-                $this->assertFalse( $result );
+        public function test_wp_query_removes_filter_wp_allow_query_attachment_by_filename() {
+                $attachment = self::factory()->post->create(
+                        array(
+                                'post_type'    => 'attachment',
+                                'post_status'  => 'publish',
+                                'post_title'   => 'bar foo',
+                                'post_content' => 'foo bar',
+                                'post_excerpt' => 'This post has foo',
+                        )
+                );
+
+                add_post_meta( $attachment, '_wp_attached_file', 'some-image1.png', true );
+                add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
+
+                $q = new WP_Query(
+                        array(
+                                's'           => 'image1',
+                                'fields'      => 'ids',
+                                'post_type'   => 'attachment',
+                                'post_status' => 'inherit',
+                        )
+                );
+
+                $this->assertSame( array( $attachment ), $q->posts );
+
+                /*
+                 * WP_Query should have removed the wp_allow_query_attachment_by_filename filter
+                 * and thus not match the attachment created above.
+                 */
+                $q->get_posts();
+                $this->assertEmpty( $q->posts );
         }