Changeset 41071 for branches/4.8/tests/phpunit/tests/widgets/text-widget.php

Timestamp:

07/18/2017 04:20:17 AM (7 years ago)

Author:

westonruter

Message:

Widgets: Discount shortcodes and leading/trailing line breaks for triggering Text widget legacy mode.

Since shortcode handling is just-in-time deferred to run after wpautop, there is no need to retain the presence of shortcodes to trigger legacy mode. Also updates Text widget legacy mode notice informing of Custom HTML widget.

Merges [41070] onto 4.8 branch.
Amends [41050].
Props westonruter, melchoyce.
Fixes #40951 for 4.8.1.

Location:

branches/4.8

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/widgets/text-widget.php (modified) (2 diffs)

branches/4.8/tests/phpunit/tests/widgets/text-widget.php

@@ -267 +267 @@
 
         $instance = array_merge( $base_instance, array(
+            'text' => "\nOne line",
+            'filter' => false,
+        ) );
+        $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when there is leading whitespace.' );
+
+        $instance = array_merge( $base_instance, array(
+            'text' => "\nOne line\n\n",
+            'filter' => false,
+        ) );
+        $this->assertFalse( $widget->is_legacy_instance( $instance ), 'Not legacy when there is trailing whitespace.' );
+
+        $instance = array_merge( $base_instance, array(
             'text' => "One\nTwo",
             'filter' => false,
@@ -295 +307 @@
         ) );
         $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy when HTML comment is present.' );
-
-        $instance = array_merge( $base_instance, array(
-            'text' => 'Here is a [gallery]',
-            'filter' => true,
-        ) );
-        $this->assertTrue( $widget->is_legacy_instance( $instance ), 'Legacy mode when a shortcode is present.' );
 
         // Check text examples that will not migrate to TinyMCE.