Changeset 35257

Timestamp:

10/18/2015 04:50:15 AM (8 years ago)

Author:

johnbillion

Message:

Add is_embed() to WP_UnitTestCase::assertQueryTrue() and update the relevant embed tests.

See #32522

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (2 diffs)
• tests/oembed/template.php (modified) (8 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -525 +525 @@
         global $wp_query;
         $all = array(
-            'is_single', 'is_preview', 'is_page', 'is_archive', 'is_date', 'is_year', 'is_month', 'is_day', 'is_time',
-            'is_author', 'is_category', 'is_tag', 'is_tax', 'is_search', 'is_feed', 'is_comment_feed', 'is_trackback',
-            'is_home', 'is_404', 'is_comments_popup', 'is_paged', 'is_admin', 'is_attachment', 'is_singular', 'is_robots',
-            'is_posts_page', 'is_post_type_archive',
+            'is_404',
+            'is_admin',
+            'is_archive',
+            'is_attachment',
+            'is_author',
+            'is_category',
+            'is_comment_feed',
+            'is_comments_popup',
+            'is_date',
+            'is_day',
+            'is_embed',
+            'is_feed',
+            'is_home',
+            'is_month',
+            'is_page',
+            'is_paged',
+            'is_post_type_archive',
+            'is_posts_page',
+            'is_preview',
+            'is_robots',
+            'is_search',
+            'is_single',
+            'is_singular',
+            'is_tag',
+            'is_tax',
+            'is_time',
+            'is_trackback',
+            'is_year',
         );
         $true = func_get_args();
@@ -551 +575 @@
         $message = '';
         if ( count($not_true) )
-            $message .= implode( $not_true, ', ' ) . ' should be true. ';
+            $message .= implode( $not_true, ', ' ) . ' is expected to be true. ';
         if ( count($not_false) )
-            $message .= implode( $not_false, ', ' ) . ' should be false.';
+            $message .= implode( $not_false, ', ' ) . ' is expected to be false.';
         $this->assertTrue( $passed, $message );
     }

trunk/tests/phpunit/tests/oembed/template.php

@@ -18 +18 @@
         $this->go_to( get_post_embed_url( $post_id ) );
 
-        $this->assertQueryTrue( 'is_single', 'is_singular' );
+        $this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
 
         ob_start();
@@ -44 +44 @@
         $this->go_to( get_post_embed_url( $post_id ) );
 
-        $this->assertQueryTrue( 'is_single', 'is_singular' );
+        $this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
 
         ob_start();
@@ -61 +61 @@
         $GLOBALS['wp_query']->query_vars['embed'] = true;
 
-        $this->assertQueryTrue( 'is_404' );
+        $this->assertQueryTrue( 'is_404', 'is_embed' );
 
         ob_start();
@@ -84 +84 @@
         $this->go_to( get_post_embed_url( $attachment_id ) );
 
-        $this->assertQueryTrue( 'is_single', 'is_singular', 'is_attachment' );
+        $this->assertQueryTrue( 'is_single', 'is_singular', 'is_attachment', 'is_embed' );
 
         ob_start();
@@ -107 +107 @@
         $this->go_to( get_post_embed_url( $post_id ) );
 
-        $this->assertQueryTrue( 'is_404' );
+        $this->assertQueryTrue( 'is_404', 'is_embed' );
 
         ob_start();
@@ -129 +129 @@
         $this->go_to( get_post_embed_url( $post_id ) );
 
-        $this->assertQueryTrue( 'is_404' );
+        $this->assertQueryTrue( 'is_404', 'is_embed' );
 
         ob_start();
@@ -150 +150 @@
         $this->go_to( get_post_embed_url( $post_id ) );
 
-        $this->assertQueryTrue( 'is_404' );
+        $this->assertQueryTrue( 'is_404', 'is_embed' );
 
         ob_start();
@@ -175 +175 @@
         $this->go_to( get_post_embed_url( $post_id ) );
 
-        $this->assertQueryTrue( 'is_single', 'is_singular' );
+        $this->assertQueryTrue( 'is_single', 'is_singular', 'is_embed' );
 
         ob_start();