Changeset 54723

Timestamp:

10/30/2022 02:52:04 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correctly restore the wp_installing() status in Ajax tests.

In the tests for updating a plugin or theme via Ajax, wp_installing( true ) was called to prevent wp_update_plugins() or wp_update_themes() from running.

Since the subsequent wp_installing( false ) call was in the same try { ... } block, it could not be executed if an exception was thrown, affecting other tests.

In this case, after rearranging the Ajax tests in [54722], this started affecting the get_site_option() calls in the tests for wp_ajax_wp_compression_test().

By moving both wp_installing() calls out of the try/catch block, we can ensure the status is correctly restored.

Follow-up to [734/tests], [37150], [38168], [38710], [54722].

See #56793.

Location:

trunk/tests/phpunit/tests/ajax

Files:

• wpAjaxUpdatePlugin.php (modified) (1 diff)
• wpAjaxUpdateTheme.php (modified) (1 diff)

trunk/tests/phpunit/tests/ajax/wpAjaxUpdatePlugin.php

@@ -142 +142 @@
         $_POST['slug']        = 'hello-dolly';
 
+        // Prevent wp_update_plugins() from running.
+        wp_installing( true );
+
         // Make the request.
         try {
-            // Prevent wp_update_plugins() from running.
-            wp_installing( true );
             $this->_handleAjax( 'update-plugin' );
-            wp_installing( false );
         } catch ( WPAjaxDieContinueException $e ) {
             unset( $e );
         }
+
+        wp_installing( false );
 
         // Get the response.

trunk/tests/phpunit/tests/ajax/wpAjaxUpdateTheme.php

@@ -113 +113 @@
         $_POST['slug']        = 'twentyten';
 
+        // Prevent wp_update_themes() from running.
+        wp_installing( true );
+
         // Make the request.
         try {
-
-            // Prevent wp_update_themes() from running.
-            wp_installing( true );
             $this->_handleAjax( 'update-theme' );
-            wp_installing( false );
-
         } catch ( WPAjaxDieContinueException $e ) {
             unset( $e );
         }
+
+        wp_installing( false );
 
         // Get the response.