Changeset 40091 for branches/4.7/tests/phpunit/tests/formatting/Autop.php

Timestamp:

02/21/2017 03:41:42 AM (8 years ago)

Author:

dd32

Message:

Formatting: fix wpautop() to stop adding paragraph tags around <figcaption>.

Props azaozz, pbearne for tests.
Merges [39912], [39914] to the 4.7 branch.
Fixes #39307 for 4.7.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/formatting/Autop.php (modified) (1 diff)

branches/4.7/tests/phpunit/tests/formatting/Autop.php

@@ -535 +535 @@
         $this->assertEquals( $expected, trim( wpautop( $content ) ) );
     }
+
+    /**
+     * wpautop() should not add extra </p> before <figcaption>
+     *
+     * @covers ::wpautop
+     * @uses trim
+     *
+     * @ticket 39307
+     */
+    function test_that_wpautop_doses_not_add_extra_closing_p_in_figure() {
+        $content1 = $expected1 = '<figure><img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
+
+        $content2 = '<figure>
+<img src="example.jpg" />
+<figcaption>Caption</figcaption>
+</figure>';
+
+        $expected2 = '<figure>
+<img src="example.jpg" /><figcaption>Caption</figcaption></figure>';
+
+        $this->assertEquals( $expected1, trim( wpautop( $content1 ) ) );
+        $this->assertEquals( $expected2, trim( wpautop( $content2 ) ) );
+    }
+
 }