Changeset 846 in tests

Timestamp:

07/02/2012 12:52:09 AM (13 years ago)

Author:

kurtpayne

Message:

Run ajax tests in separate processes so DOING_AJAX doesn't interfere with other tests

Location:

trunk

Files:

• wp-testcase/test-ajax-actions/test_admin_ajax_compression_test.php (modified) (1 diff)
• wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php (modified) (1 diff)
• wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php (modified) (1 diff)
• wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php (modified) (1 diff)
• wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php (modified) (1 diff)
• wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php (modified) (1 diff)
• wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php (modified) (2 diffs)
• wp-testcase/test-ajax-actions/test_admin_ajax_tag_search.php (modified) (1 diff)
• wp-testlib/testcase-ajax.php (modified) (2 diffs)

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_compression_test.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxCompressionTest extends WP_Ajax_UnitTestCase {

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_delete_comments.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxCommentsDelete extends WP_Ajax_UnitTestCase {

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_dim_comments.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxCommentsDim extends WP_Ajax_UnitTestCase {

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_edit_comment.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxCommentsEdit extends WP_Ajax_UnitTestCase {

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_get_comments.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxCommentsGet extends WP_Ajax_UnitTestCase {

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_replyto_comment.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxCommentsReply extends WP_Ajax_UnitTestCase {

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_save_draft.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxSaveDraft extends WP_Ajax_UnitTestCase {
@@ -21 +22 @@
      */
     protected $_post = null;
-    
     
     /**

trunk/wp-testcase/test-ajax-actions/test_admin_ajax_tag_search.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
+ * @runTestsInSeparateProcesses
  */
 class TestAjaxTagSearch extends WP_Ajax_UnitTestCase {

trunk/wp-testlib/testcase-ajax.php

@@ -52 +52 @@
 
     /**
-     * Constructor.
-     * Register all of the ajax actions
-     */
-    public function __construct() {
-        parent::__construct();
-        foreach ( array_merge( $this->_core_actions_get, $this->_core_actions_post ) as $action )
-            if ( function_exists( 'wp_ajax_' . str_replace( '-', '_', $action ) ) )
-                add_action( 'wp_ajax_' . $action, 'wp_ajax_' . str_replace( '-', '_', $action ), 1 );
-    }
-
-    /**
      * Set up the test fixture.
      * Override wp_die(), pretend to be ajax, and suppres E_WARNINGs
@@ -68 +57 @@
     public function setUp() {
         parent::setUp();
+
+        // Register the core actions
+        foreach ( array_merge( $this->_core_actions_get, $this->_core_actions_post ) as $action )
+            if ( function_exists( 'wp_ajax_' . str_replace( '-', '_', $action ) ) )
+                add_action( 'wp_ajax_' . $action, 'wp_ajax_' . str_replace( '-', '_', $action ), 1 );
+
         add_filter( 'wp_die_ajax_handler', array( $this, 'getDieHandler' ), 1, 1 );
         if ( !defined( 'DOING_AJAX' ) )