Ticket #26642: 26642.5.diff

tests/phpunit/tests/media.php

@@ -108 +108 @@
                 $this->assertEquals( 1, preg_match_all( "~wp-caption-text.*{$content_preg}~", $result, $_r ) );
         }
 
+        function test_new_img_caption_shortcode_new_format_no_inline() {
+                add_theme_support( 'no-inline-style-captions' );
+                $result = img_caption_shortcode(
+                        array( 'width' => 20 ),
+                        $this->img_content . $this->html_content
+                );
+                $img_preg = preg_quote( $this->img_content );
+                $content_preg = preg_quote( $this->html_content );
+
+                $this->assertEquals( 1, preg_match( "~^<div class=\"wp-caption alignnone\">{$img_preg}<p class=\"wp-caption-text\">{$content_preg}</p></div>$~", $result ) );
+                remove_theme_support( 'no-inline-style-captions' );
+        }
+
         function test_add_remove_oembed_provider() {
                 wp_oembed_add_provider( 'http://foo.bar/*', 'http://foo.bar/oembed' );
                 $this->assertTrue( wp_oembed_remove_provider( 'http://foo.bar/*' ) );