Changeset 29760 for trunk/tests/phpunit/tests/post/query.php

Timestamp:

09/23/2014 03:51:24 AM (12 years ago)

Author:

wonderboymusic

Message:

Ordering by RAND():

The shortcode callbacks for gallery and playlist check for 'RAND' == $atts['order'], which isn't a valid value for order. Remove those checks and update the docs.

In WP_Query, if the value of orderby is rand, order is irrelevant and should be unset.

Adds unit tests.

Fixes #29629.

File:

• trunk/tests/phpunit/tests/post/query.php (modified) (1 diff)

trunk/tests/phpunit/tests/post/query.php

@@ -832 +832 @@
                 );
         }
+
+        /**
+         * @ticket 29629
+         */
+        function test_orderby() {
+                // 'rand' is a valid value
+                $q = new WP_Query( array( 'orderby' => 'rand' ) );
+                $this->assertContains( 'ORDER BY RAND()', $q->request );
+                $this->assertNotContains( 'ASC', $q->request );
+                $this->assertNotContains( 'DESC', $q->request );
+
+                // This isn't allowed
+                $q2 = new WP_Query( array( 'order' => 'rand' ) );
+                $this->assertContains( 'ORDER BY', $q2->request );
+                $this->assertNotContains( 'RAND()', $q2->request );
+                $this->assertContains( 'DESC', $q2->request );
+
+                // 'none' is a valid value
+                $q3 = new WP_Query( array( 'orderby' => 'none' ) );
+                $this->assertNotContains( 'ORDER BY', $q3->request );
+                $this->assertNotContains( 'DESC', $q3->request );
+                $this->assertNotContains( 'ASC', $q3->request );
+
+                // false is a valid value
+                $q4 = new WP_Query( array( 'orderby' => false ) );
+                $this->assertNotContains( 'ORDER BY', $q4->request );
+                $this->assertNotContains( 'DESC', $q4->request );
+                $this->assertNotContains( 'ASC', $q4->request );
+
+                // empty array() is a valid value
+                $q5 = new WP_Query( array( 'orderby' => array() ) );
+                $this->assertNotContains( 'ORDER BY', $q5->request );
+                $this->assertNotContains( 'DESC', $q5->request );
+                $this->assertNotContains( 'ASC', $q5->request );
+        }
 }