Changeset 31662

Timestamp:

03/07/2015 03:44:28 PM (10 years ago)

Author:

boonebgorges

Message:

Tests for some existing 'orderby' functionality in WP_*_Query classes.

• In WP_Query and WP_Comment_Query, ensure that 'orderby' can parse multiple values for 'orderby' when passed as a space-separated string.
• In WP_User_Query, ensure that "shorthand" orderbys (like 'login' and 'name') are converted to their full versions (like 'user_login' and 'display_name').

See #31265.

Location:

trunk/tests/phpunit/tests

Files:

• comment/query.php (modified) (1 diff)
• query.php (modified) (1 diff)
• user/query.php (modified) (1 diff)

trunk/tests/phpunit/tests/comment/query.php

@@ -1109 +1109 @@
     }
 
+    public function test_orderby_space_separated() {
+        global $wpdb;
+
+        $q = new WP_Comment_Query();
+        $q->query( array(
+            'orderby' => 'comment_agent comment_approved',
+        ) );
+
+        $this->assertContains( "ORDER BY $wpdb->comments.comment_agent DESC, $wpdb->comments.comment_approved DESC", $q->request );
+    }
+
     public function test_orderby_comma_separated() {
         global $wpdb;

trunk/tests/phpunit/tests/query.php

@@ -123 +123 @@
         unset( $q->query_vars['wptests_tax'] );
     }
+
+    public function test_orderby_space_separated() {
+        global $wpdb;
+
+        $q = new WP_Query( array(
+            'orderby' => 'title date',
+            'order' => 'DESC',
+        ) );
+
+        $this->assertContains( "ORDER BY $wpdb->posts.post_title DESC, $wpdb->posts.post_date DESC", $q->request );
+    }
 }

trunk/tests/phpunit/tests/user/query.php

@@ -112 +112 @@
             $this->assertInstanceOf( 'WP_User', $user );
         }
+    }
+
+    /**
+     * @dataProvider orderby_should_convert_non_prefixed_keys_data
+     */
+    public function test_orderby_should_convert_non_prefixed_keys( $short_key, $full_key ) {
+        $q = new WP_User_Query( array(
+            'orderby' => $short_key,
+        ) );
+
+        $this->assertContains( "ORDER BY $full_key", $q->query_orderby );
+    }
+
+    public function orderby_should_convert_non_prefixed_keys_data() {
+        return array(
+            array( 'nicename', 'user_nicename' ),
+            array( 'email', 'user_email' ),
+            array( 'url', 'user_url' ),
+            array( 'registered', 'user_registered' ),
+            array( 'name', 'display_name' ),
+        );
     }