Tweak unit tests to work with changesets

xwp · Oct 7, 2016 · 78c2c6b · 78c2c6b
1 parent ca32e22
commit 78c2c6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/php/class-wp-customize-widget-setting.php b/php/class-wp-customize-widget-setting.php
@@ -166,6 +166,20 @@ public function apply_preview() {
 		if ( ! is_null( $value ) ) {
 			$this->widget_posts->current_widget_type_values[ $this->widget_id_base ][ $this->widget_number ] = $value;
 		}
+
+		add_action( "customize_post_value_set_{$this->id}", array( $this, '_update_current_widget_type_value' ) );
+	}
+
+	/**
+	 * Make sure that the cached widget preview value is updated when the post value is updated.
+	 *
+	 * @access private
+	 */
+	function _update_current_widget_type_value() {
+		$value = $this->post_value();
+		if ( ! is_null( $value ) ) {
+			$this->widget_posts->current_widget_type_values[ $this->widget_id_base ][ $this->widget_number ] = $value;
+		}
 	}
 
 	/**

diff --git a/tests/test-class-widget-posts-with-customizer.php b/tests/test-class-widget-posts-with-customizer.php
@@ -52,7 +52,6 @@ function setUp() {
 		global $wp_registered_widgets;
 		$wp_registered_widgets = array();
 		wp_widgets_init();
-		do_action( 'wp_loaded' );
 	}
 
 	/**
@@ -88,6 +87,7 @@ function test_customize_widgets_save() {
 		);
 		$sanitized_widget_instance = $this->customize_manager->widgets->sanitize_widget_js_instance( $override_widget_data );
 		$this->customize_manager->set_post_value( $setting_id, $sanitized_widget_instance );
+		$this->customize_manager->add_dynamic_settings( array( $setting_id ) );
 
 		$widget_post = $this->widget_posts->get_widget_post( $widget_id );
 		$this->assertEquals( $initial_search_widgets[2], $this->widget_posts->get_widget_instance_data( $widget_post ) );