Changeset 28797

Timestamp:

06/21/2014 07:59:28 PM (10 years ago)

Author:

wonderboymusic

Message:

Allow wp_die() to die in plain text when running the test suite.

Props jorbin.
Fixes #27749.

Location:

trunk/tests/phpunit/includes

Files:

• bootstrap.php (modified) (2 diffs)
• functions.php (modified) (1 diff)
• utils.php (modified) (1 diff)

trunk/tests/phpunit/includes/bootstrap.php

@@ -48 +48 @@
 // Override the PHPMailer
 require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
-$phpmailer = new MockPHPMailer(); 
+$phpmailer = new MockPHPMailer();
 
 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
@@ -67 +67 @@
 
 require_once dirname( __FILE__ ) . '/functions.php';
+
+$GLOBALS['_wp_die_disabled'] = false;
+// Allow tests to override wp_die
+tests_add_filter( 'wp_die_handler', '_wp_die_handler_filter' );
 
 // Preset WordPress options defined in bootstrap file.

trunk/tests/phpunit/includes/functions.php

@@ -72 +72 @@
 
 class Basic_Subclass extends Basic_Object {}
+
+function _wp_die_handler( $message, $title = '', $args = array() ) {
+    if ( !$GLOBALS['_wp_die_disabled'] ) {
+        _wp_die_handler_txt( $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';
+}
+
+function _wp_die_handler_txt( $message, $title, $args ) {
+    echo "\nwp_die called\n";
+    echo "Message : $message\n";
+    echo "Title : $title\n";
+    if ( ! empty( $args ) ) {
+        echo "Args: \n";
+        foreach( $args as $k => $v ){
+            echo "\t $k : $v\n";
+        }
+    }
+}

trunk/tests/phpunit/includes/utils.php

@@ -303 +303 @@
 }
 
-$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';
-}
-
 if ( !function_exists( 'str_getcsv' ) ) {
     function str_getcsv( $input, $delimiter = ',', $enclosure = '"', $escape = "\\" ) {