From 7e1e0005ad9a0725b24a5cb8d8b59627c2bae580 Mon Sep 17 00:00:00 2001 From: Jonny Harris Date: Thu, 30 Mar 2023 12:15:36 +0000 Subject: [PATCH] Tests: Fix tests introduced in [55612]. In [55612] a change was added that made two unit tests fail. Fix these test by forcing `get_merged_data` method to run. Props spacedmonkey, mukesh27. See #57814. git-svn-id: https://develop.svn.wordpress.org/trunk@55613 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/theme/wpThemeJsonResolver.php | 3 ++- tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/tests/theme/wpThemeJsonResolver.php b/tests/phpunit/tests/theme/wpThemeJsonResolver.php index b649531943..f013542e2e 100644 --- a/tests/phpunit/tests/theme/wpThemeJsonResolver.php +++ b/tests/phpunit/tests/theme/wpThemeJsonResolver.php @@ -729,7 +729,8 @@ class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase { public function test_get_theme_data_theme_supports_overrides_theme_json() { // Test that get_theme_data() returns a WP_Theme_JSON object. $theme_json_resolver = new WP_Theme_JSON_Resolver(); - $theme_data = $theme_json_resolver->get_theme_data(); + $theme_json_resolver->get_merged_data(); + $theme_data = $theme_json_resolver->get_theme_data(); $this->assertInstanceOf( 'WP_Theme_JSON', $theme_data, 'Theme data should be an instance of WP_Theme_JSON.' ); // Test that wp_theme_json_data_theme filter has been called. diff --git a/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php b/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php index 1c084044f6..7202417dde 100644 --- a/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php +++ b/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php @@ -131,6 +131,7 @@ EOF; switch_theme( $theme_name ); do_action( 'after_setup_theme' ); wp_clean_theme_json_cache(); + do_action( 'plugins_loaded' ); do_action( 'wp_loaded' ); do_action( 'wp_enqueue_scripts' ); }