Changeset 55613

Timestamp:

03/30/2023 12:15:36 PM (2 years ago)

Author:

spacedmonkey

Message:

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.

Location:

trunk/tests/phpunit/tests

Files:

• theme/wpThemeJsonResolver.php (modified) (1 diff)
• webfonts/wpThemeJsonWebfontsHandler.php (modified) (1 diff)

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -730 +730 @@
         // 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.' );
 

trunk/tests/phpunit/tests/webfonts/wpThemeJsonWebfontsHandler.php

@@ -132 +132 @@
         do_action( 'after_setup_theme' );
         wp_clean_theme_json_cache();
+        do_action( 'plugins_loaded' );
         do_action( 'wp_loaded' );
         do_action( 'wp_enqueue_scripts' );