From 75e4de9671d44c1983ef0db06dc1777e63215e84 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 15 Oct 2015 01:28:05 +0000 Subject: [PATCH] Unit Tests: move some oEmbed tests that can trigger HTTP calls to `Tests_External_HTTP_OEmbed`. See #30017, #33968. git-svn-id: https://develop.svn.wordpress.org/trunk@35178 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/external-http/oembed.php | 46 ++++++++++++++++++++ tests/phpunit/tests/media.php | 41 ----------------- 2 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 tests/phpunit/tests/external-http/oembed.php diff --git a/tests/phpunit/tests/external-http/oembed.php b/tests/phpunit/tests/external-http/oembed.php new file mode 100644 index 0000000000..3f227393d4 --- /dev/null +++ b/tests/phpunit/tests/external-http/oembed.php @@ -0,0 +1,46 @@ +assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); + + $out = wp_oembed_get( 'https://www.youtube.com/watch?v=oHg5SJYRHA0' ); + $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); + + $out = wp_oembed_get( 'https://youtu.be/zHjMoNQN7s0' ); + $this->assertContains( 'https://www.youtube.com/embed/zHjMoNQN7s0?feature=oembed', $out ); + } + + /** + * Test m.youtube.com embeds + * + * @ticket 32714 + */ + function test_youtube_com_mobile_embed() { + $out = wp_oembed_get( 'http://m.youtube.com/watch?v=oHg5SJYRHA0' ); + $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); + + $out = wp_oembed_get( 'https://m.youtube.com/watch?v=oHg5SJYRHA0' ); + $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); + } + + function test_youtube_embed_url() { + global $wp_embed; + $out = $wp_embed->autoembed( 'https://www.youtube.com/embed/QcIy9NiNbmo' ); + $this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out ); + } + + function test_youtube_v_url() { + global $wp_embed; + $out = $wp_embed->autoembed( 'https://www.youtube.com/v/QcIy9NiNbmo' ); + $this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out ); + } +} \ No newline at end of file diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php index f4888af191..3d824c52f2 100644 --- a/tests/phpunit/tests/media.php +++ b/tests/phpunit/tests/media.php @@ -114,47 +114,6 @@ CAP; $this->assertFalse( wp_oembed_remove_provider( 'http://foo.bar/*' ) ); } - /** - * Test secure youtube.com embeds - * - * @ticket 23149 - */ - function test_youtube_com_secure_embed() { - $out = wp_oembed_get( 'http://www.youtube.com/watch?v=oHg5SJYRHA0' ); - $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); - - $out = wp_oembed_get( 'https://www.youtube.com/watch?v=oHg5SJYRHA0' ); - $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); - - $out = wp_oembed_get( 'https://youtu.be/zHjMoNQN7s0' ); - $this->assertContains( 'https://www.youtube.com/embed/zHjMoNQN7s0?feature=oembed', $out ); - } - - /** - * Test m.youtube.com embeds - * - * @ticket 32714 - */ - function test_youtube_com_mobile_embed() { - $out = wp_oembed_get( 'http://m.youtube.com/watch?v=oHg5SJYRHA0' ); - $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); - - $out = wp_oembed_get( 'https://m.youtube.com/watch?v=oHg5SJYRHA0' ); - $this->assertContains( 'https://www.youtube.com/embed/oHg5SJYRHA0?feature=oembed', $out ); - } - - function test_youtube_embed_url() { - global $wp_embed; - $out = $wp_embed->autoembed( 'https://www.youtube.com/embed/QcIy9NiNbmo' ); - $this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out ); - } - - function test_youtube_v_url() { - global $wp_embed; - $out = $wp_embed->autoembed( 'https://www.youtube.com/v/QcIy9NiNbmo' ); - $this->assertContains( 'https://youtube.com/watch?v=QcIy9NiNbmo', $out ); - } - /** * @ticket 23776 */