Ticket #41561: 41561.diff

tests/phpunit/includes/testcase-ajax.php

@@ -59 +59 @@
         );
 
         public static function setUpBeforeClass() {
-                if ( ! defined( 'DOING_AJAX' ) ) {
-                        define( 'DOING_AJAX', true );
-                }
+                add_filter( 'wp_doing_ajax', '__return_true' );         
 
                 remove_action( 'admin_init', '_maybe_update_core' );
                 remove_action( 'admin_init', '_maybe_update_plugins' );

tests/phpunit/tests/ajax/Response.php

@@ -23 +23 @@
                 parent::setUp();
 
                 add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
-                if ( !defined( 'DOING_AJAX' ) )
-                        define( 'DOING_AJAX', true );
+                add_filter( 'wp_doing_ajax', '__return_true' );
 
                 // Suppress warnings from "Cannot modify header information - headers already sent by"
                 $this->_error_level = error_reporting();

tests/phpunit/tests/customize/manager.php

@@ -1544 +1544 @@
          * @group ajax
          */
         function test_doing_ajax() {
-                if ( ! defined( 'DOING_AJAX' ) ) {
-                        define( 'DOING_AJAX', true );
-                }
+                add_filter( 'wp_doing_ajax', '__return_true' );
 
                 $manager = $this->manager;
                 $this->assertTrue( $manager->doing_ajax() );
@@ -1560 +1558 @@
          * Test ! WP_Customize_Manager::doing_ajax().
          */
         function test_not_doing_ajax() {
-                if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+                $doing_ajax = wp_doing_ajax();
+                if ( $doing_ajax ) {
                         $this->markTestSkipped( 'Cannot test when DOING_AJAX' );
                 }
 

tests/phpunit/tests/customize/selective-refresh-ajax.php

@@ -37 +37 @@
         function setUp() {
                 parent::setUp();
 
-                // Define DOING_AJAX so that wp_die() will be used instead of die().
-                if ( ! defined( 'DOING_AJAX' ) ) {
-                        define( 'DOING_AJAX', true );
-                }
+                // Define wp_doing_ajax so that wp_die() will be used instead of die().
+                add_filter( 'wp_doing_ajax', '__return_true' );
                 add_filter( 'wp_die_ajax_handler', array( $this, 'get_wp_die_handler' ), 1, 1 );
 
                 require_once( ABSPATH . WPINC . '/class-wp-customize-manager.php' );