Changeset 41133 for branches/4.8/tests/phpunit/tests/widgets/custom-html-widget.php

Timestamp:

07/24/2017 10:53:20 PM (7 years ago)

Author:

westonruter

Message:

Widgets: Rename Text widget's legacy mode to non-visual mode, restore boolean filter prop, and improve compatibility for widget_text filters applied in Custom HTML widget.

Merges [41132] onto 4.8 branch.
Amends [41050].
Props westonruter, obenland, timmydcrawford for testing.
See #35243, #40951, #40907.
Fixes #41394 for 4.8.1.

Location:

branches/4.8

Files:

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

branches/4.8/tests/phpunit/tests/widgets/custom-html-widget.php

@@ -60 +60 @@
         );
 
+        // Convert Custom HTML widget instance into Text widget instance data.
+        $text_widget_instance = array_merge( $instance, array(
+            'text' => $instance['content'],
+            'filter' => false,
+            'visual' => false,
+        ) );
+        unset( $text_widget_instance['content'] );
+
         update_option( 'use_balanceTags', 0 );
         add_filter( 'widget_custom_html_content', array( $this, 'filter_widget_custom_html_content' ), 5, 3 );
@@ -76 +84 @@
         $this->assertNotContains( '<br>', $output );
         $this->assertNotContains( '</u>', $output );
-        $this->assertEquals( $instance, $this->widget_text_args[1] );
+        $this->assertEquals( $text_widget_instance, $this->widget_text_args[1] );
         $this->assertEquals( $instance, $this->widget_custom_html_content_args[1] );
         $this->assertSame( $widget, $this->widget_text_args[2] );
         $this->assertSame( $widget, $this->widget_custom_html_content_args[2] );
-        remove_filter( 'widget_custom_html_content', array( $this, 'filter_widget_custom_html_content' ), 5, 3 );
+        remove_filter( 'widget_custom_html_content', array( $this, 'filter_widget_custom_html_content' ), 5 );
         remove_filter( 'widget_text', array( $this, 'filter_widget_text' ), 10 );