Changeset 38514

Timestamp:

09/02/2016 10:52:48 PM (10 years ago)

Author:

johnbillion

Message:

Embeds: Clarify some assertion failure messages and correct a test URL for Twitter timelines.

See #32360

File:

• trunk/tests/phpunit/tests/oembed.php (modified) (6 diffs)

trunk/tests/phpunit/tests/oembed.php

@@ -93 +93 @@
                         }
 
-                        $this->assertSame( 200, wp_remote_retrieve_response_code( $r ), $msg );
+                        $http_code    = wp_remote_retrieve_response_code( $r );
+                        $http_message = wp_remote_retrieve_response_message( $r );
+                        $this->assertSame( 200, $http_code, "{$msg}\n- HTTP response code: {$http_code} {$http_message}" );
 
                 }
@@ -135 +137 @@
                                 'discover' => false,
                         ) );
-                        $this->assertNotFalse( $provider, $msg );
+                        $this->assertNotFalse( $provider, "{$msg}\n- No oEmbed provider found." );
 
                         $data = self::$oembed->fetch( $provider, $url, $args );
@@ -167 +169 @@
                         }
 
-                        $this->assertSame( 200, wp_remote_retrieve_response_code( $r['response'] ), $msg );
+                        $http_code    = wp_remote_retrieve_response_code( $r['response'] );
+                        $http_message = wp_remote_retrieve_response_message( $r['response'] );
+                        $this->assertSame( 200, $http_code, "{$msg}\n- HTTP response code: {$http_code} {$http_message}" );
 
                         // Test response
@@ -343 +347 @@
                         'discover' => false,
                 ) );
-                $this->assertNotFalse( $provider, $msg );
+                $this->assertNotFalse( $provider, "{$msg}\n- No oEmbed provider found." );
                 $data = self::$oembed->fetch( $provider, $url, $args );
 
@@ -370 +374 @@
                 }
 
-                $this->assertTrue( in_array( wp_remote_retrieve_response_code( $r['response'] ), array(
+                $http_code    = wp_remote_retrieve_response_code( $r['response'] );
+                $http_message = wp_remote_retrieve_response_message( $r['response'] );
+                $this->assertContains( $http_code, array(
                         200,
                         400,
                         404,
-                ), true ), $msg );
+                ), "{$msg}\n- HTTP response code: {$http_code} {$http_message}" );
 
                 if ( false === $data ) {
@@ -580 +586 @@
                                 $providers['twitter-timeline'],
                                 array(
-                                        'https://twitter.com/wordpress',
+                                        'https://twitter.com/TwitterDev/timelines/539487832448843776',
                                 ),
                         ),