Changeset 41047 for trunk/tests/phpunit/tests/oembed/controller.php

Timestamp:

07/14/2017 04:04:04 PM (7 years ago)

Author:

westonruter

Message:

REST API: Ensure maxwidth and maxheight params are forwarded to oEmbed provider in proxy requests.

Also correct phpdoc return tag on WP_oEmbed_Controller::get_proxy_item() and remove dead code in oEmbed controller phpunit tests.

Amends [40628].
See #40450.
Fixes #41299.

File:

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

trunk/tests/phpunit/tests/oembed/controller.php

@@ -50 +50 @@
         parent::tearDown();
 
-        remove_filter( 'pre_http_request', array( $this, 'mock_embed_request' ), 10, 3 );
+        remove_filter( 'pre_http_request', array( $this, 'mock_embed_request' ), 10 );
     }
 
@@ -71 +71 @@
         unset( $preempt, $r );
 
+        $parsed_url = wp_parse_url( $url );
+        parse_str( $parsed_url['query'], $query_params );
         $this->request_count += 1;
 
         // Mock request to YouTube Embed.
-        if ( false !== strpos( $url, self::YOUTUBE_VIDEO_ID ) ) {
+        if ( ! empty( $query_params['url'] ) && false !== strpos( $query_params['url'], self::YOUTUBE_VIDEO_ID ) ) {
             return array(
                 'response' => array(
@@ -85 +87 @@
                         'provider_name'    => 'YouTube',
                         'provider_url'     => 'https://www.youtube.com',
-                        'thumbnail_width'  => 480,
-                        'width'            => 500,
-                        'thumbnail_height' => 360,
-                        'html'             => '<iframe width="500" height="375" src="https://www.youtube.com/embed/' . self::YOUTUBE_VIDEO_ID . '?feature=oembed" frameborder="0" allowfullscreen></iframe>',
+                        'thumbnail_width'  => $query_params['maxwidth'],
+                        'width'            => $query_params['maxwidth'],
+                        'thumbnail_height' => $query_params['maxheight'],
+                        'height'           => $query_params['maxheight'],
+                        'html'             => '<iframe width="' . $query_params['maxwidth'] . '" height="' . $query_params['maxheight'] . '" src="https://www.youtube.com/embed/' . self::YOUTUBE_VIDEO_ID . '?feature=oembed" frameborder="0" allowfullscreen></iframe>',
                         'author_name'      => 'Yosemitebear62',
                         'thumbnail_url'    => 'https://i.ytimg.com/vi/' . self::YOUTUBE_VIDEO_ID . '/hqdefault.jpg',
                         'title'            => 'Yosemitebear Mountain Double Rainbow 1-8-10',
-                        'height'           => 375,
                     )
                 ),
@@ -478 +480 @@
 
         $this->assertEquals( 400, $response->get_status() );
-        $data = $response->get_data();
     }
 
@@ -485 +486 @@
         $request = new WP_REST_Request( 'GET', '/oembed/1.0/proxy' );
         $request->set_param( 'url', 'https://www.youtube.com/watch?v=' . self::YOUTUBE_VIDEO_ID );
+        $request->set_param( 'maxwidth', 456 );
+        $request->set_param( 'maxheight', 789 );
         $request->set_param( '_wpnonce', wp_create_nonce( 'wp_rest' ) );
         $response = $this->server->dispatch( $request );
@@ -499 +502 @@
         $request->set_param( 'url', 'https://www.youtube.com/watch?v=' . self::YOUTUBE_VIDEO_ID );
         $request->set_param( '_wpnonce', wp_create_nonce( 'wp_rest' ) );
+        $request->set_param( 'maxwidth', 456 );
+        $request->set_param( 'maxheight', 789 );
         $response = $this->server->dispatch( $request );
         $this->assertEquals( 1, $this->request_count );
@@ -509 +514 @@
         $this->assertEquals( 'YouTube', $data->provider_name );
         $this->assertEquals( 'https://i.ytimg.com/vi/' . self::YOUTUBE_VIDEO_ID . '/hqdefault.jpg', $data->thumbnail_url );
+        $this->assertEquals( $data->width, $request['maxwidth'] );
+        $this->assertEquals( $data->height, $request['maxheight'] );
     }