Ticket #24662: 24662.patch

trunk/includes/bootstrap.php

@@ -41 +41 @@
 
 $multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
 
+// Override the phpmailer
+require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+$GLOBALS['phpmailer'] = new MockPHPMailer();
+
 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $multisite );
 
 if ( $multisite ) {

trunk/includes/mock-mailer.php

@@ -1 +1 @@
 <?php
+require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
 
-require_once(ABSPATH . '/wp-includes/class-phpmailer.php');
-
 class MockPHPMailer extends PHPMailer {
         var $mock_sent = array();
 
         // override the Send function so it doesn't actually send anything
         function Send() {
-                if ( (count($this->to) + count($this->cc) + count($this->bcc)) < 1 ) {
-                        $this->SetError( 'You must provide at least one recipient email address.' );
-                        return false;
-                }
+                try {
+                        if ( ! $this->PreSend() )
+                                return false;
 
-                // Set whether the message is multipart/alternative
-                if( ! empty($this->AltBody) )
-                        $this->ContentType = 'multipart/alternative';
+                        $this->mock_sent[] = array(
+                                'to' => $this->to,
+                                'cc' => $this->cc,
+                                'bcc' => $this->bcc,
+                                'header' => $this->MIMEHeader,
+                                'body' => $this->MIMEBody,
+                        );
 
-                $this->error_count = 0; // reset errors
-                $this->SetMessageType();
-                $header = $this->CreateHeader();
-                $body = $this->CreateBody();
-
-                if ( $body == '' ) {
-                        $this->SetError( 'Message body empty' );
+                        return true;
+                } catch ( phpmailerException $e ) {
                         return false;
                 }
-
-                $this->mock_sent[] = array(
-                        'to' => $this->to,
-                        'cc' => $this->cc,
-                        'bcc' => $this->bcc,
-                        'header' => $header,
-                        'body' => $body,
-                );
-
-                return true;
-    }
+        }
 }
-
-?>

trunk/tests/mail.php

@@ -3 +3 @@
 /**
  * @group pluggable
  * @group mail
- * @ticket UT47
  */
 class Tests_Mail extends WP_UnitTestCase {
         function setUp() {