Changeset 52985

Timestamp:

03/23/2022 04:26:01 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use a more descriptive name for the sticky posts test that verifies the parameters from the main query.

Reorder the parameters of the get_posts() call for consistency with similar calls elsewhere.

Follow-up to [52982].

See #36907.

Location:

trunk

Files:

• src/wp-includes/class-wp-query.php (modified) (1 diff)
• tests/phpunit/tests/query/stickies.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-query.php

@@ -3261 +3261 @@
                                 $stickies = get_posts(
                                         array(
-                                                'cache_results'          => $q['cache_results'],
-                                                'lazy_load_term_meta'    => $q['lazy_load_term_meta'],
                                                 'post__in'               => $sticky_posts,
                                                 'post_type'              => $post_type,
                                                 'post_status'            => 'publish',
                                                 'suppress_filters'       => $q['suppress_filters'],
+                                                'cache_results'          => $q['cache_results'],
                                                 'update_post_meta_cache' => $q['update_post_meta_cache'],
                                                 'update_post_term_cache' => $q['update_post_term_cache'],
+                                                'lazy_load_term_meta'    => $q['lazy_load_term_meta'],
                                         )
                                 );

trunk/tests/phpunit/tests/query/stickies.php

@@ -110 +110 @@
          * @ticket 36907
          */
-        public function test_stickies_nest_query() {
+        public function test_stickies_should_obey_parameters_from_the_main_query() {
                 $filter = new MockAction();
                 add_filter( 'posts_pre_query', array( $filter, 'filter' ), 10, 2 );
@@ -120 +120 @@
                 $this->assertNotEmpty( $sticky_query_vars['posts_per_page'] );
                 $this->assertSame( $query_vars['suppress_filters'], $sticky_query_vars['suppress_filters'] );
+                $this->assertSame( $query_vars['cache_results'], $sticky_query_vars['cache_results'] );
                 $this->assertSame( $query_vars['update_post_meta_cache'], $sticky_query_vars['update_post_meta_cache'] );
                 $this->assertSame( $query_vars['update_post_term_cache'], $sticky_query_vars['update_post_term_cache'] );
                 $this->assertSame( $query_vars['lazy_load_term_meta'], $sticky_query_vars['lazy_load_term_meta'] );
-                $this->assertSame( $query_vars['cache_results'], $sticky_query_vars['cache_results'] );
                 $this->assertTrue( $sticky_query_vars['ignore_sticky_posts'] );
                 $this->assertTrue( $sticky_query_vars['no_found_rows'] );