Changeset 41293

Timestamp:

08/22/2017 03:07:42 PM (7 years ago)

Author:

johnbillion

Message:

Build/Test tools: Remove usage of DOING_AJAX from the test suite, so all tests that expect either an Ajax request or a
non-Ajax request can operate without being skipped.

Props Mte90

Fixes #41561

Location:

trunk/tests/phpunit

Files:

• includes/testcase-ajax.php (modified) (1 diff)
• tests/ajax/Response.php (modified) (1 diff)
• tests/customize/manager.php (modified) (2 diffs)
• tests/customize/selective-refresh-ajax.php (modified) (1 diff)

trunk/tests/phpunit/includes/testcase-ajax.php

@@ -60 +60 @@
 
     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' );

trunk/tests/phpunit/tests/ajax/Response.php

@@ -24 +24 @@
 
         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"

trunk/tests/phpunit/tests/customize/manager.php

@@ -1545 +1545 @@
      */
     function test_doing_ajax() {
-        if ( ! defined( 'DOING_AJAX' ) ) {
-            define( 'DOING_AJAX', true );
-        }
+        add_filter( 'wp_doing_ajax', '__return_true' );
 
         $manager = $this->manager;
@@ -1561 +1559 @@
      */
     function test_not_doing_ajax() {
-        if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-            $this->markTestSkipped( 'Cannot test when DOING_AJAX' );
-        }
+        add_filter( 'wp_doing_ajax', '__return_false' );
 
         $manager = $this->manager;

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

@@ -38 +38 @@
         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 );