Changeset 289 in tests

Timestamp:

01/21/2010 10:41:47 PM (15 years ago)

Author:

westi

Message:

Allow test cases to disable wp_die temporarily so that tests can run assertions which cause wp_die's in normal running. See WP#11892

Files:

• wp-test.php (modified) (1 diff)
• wp-testcase/test_user_capabilities.php (modified) (2 diffs)
• wp-testlib/base.php (modified) (2 diffs)
• wp-testlib/utils.php (modified) (1 diff)

wp-test.php

@@ -71 +71 @@
 require_once(ABSPATH.'wp-settings.php');
 
+// Allow tests to override wp_die
+add_filter( 'wp_die_handler', '_wp_die_handler_filter' );
+
 drop_tables();
-
 
 if (TEST_MU)

wp-testcase/test_user_capabilities.php

@@ -122 +122 @@
     // a role that doesn't exist
     function test_bogus_role() {
+        _disable_wp_die();
         $id = $this->_make_user(rand_str());
         $user = new WP_User($id);
@@ -128 +129 @@
         $this->assertEquals(array(), $user->roles);
         $this->assertFalse($user->has_cap('level_0'));
+        _enable_wp_die();
     }
 

wp-testlib/base.php

@@ -25 +25 @@
             restore_error_handler();
         }
+        _enable_wp_die();
 
         set_time_limit($this->_time_limit);
@@ -33 +34 @@
             restore_error_handler();
         }
+        _enable_wp_die();
     }
     

wp-testlib/utils.php

@@ -302 +302 @@
 }
 
+$GLOBALS['_wp_die_disabled'] = false;
+function _wp_die_handler( $message, $title = '', $args = array() ) {
+    if ( !$GLOBALS['_wp_die_disabled'] ) {
+        _default_wp_die_handler( $message, $title, $args );
+    } else {
+        //Ignore at our peril
+    }
+}
+
+function _disable_wp_die() {
+    $GLOBALS['_wp_die_disabled'] = true;
+}
+
+function _enable_wp_die() {
+    $GLOBALS['_wp_die_disabled'] = false;
+}
+
+function _wp_die_handler_filter() {
+    return '_wp_die_handler';
+}
+
 ?>