Changeset 1300 in tests

Timestamp:

06/29/2013 10:31:15 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Re-implement the mock PHPMailer. props ocean90. fixes #24662.

Location:

trunk

Files:

• includes/bootstrap.php (modified) (2 diffs)
• includes/mock-mailer.php (modified) (2 diffs)
• tests/mail.php (modified) (2 diffs)

trunk/includes/bootstrap.php

@@ -18 +18 @@
 
 // These are still needed
-global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp;
+global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer;
 
 if ( !is_readable( $config_file_path ) ) {
@@ -41 +41 @@
 
 $multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
+
+// Override the PHPMailer
+require_once( dirname( __FILE__ ) . '/mock-mailer.php' );
+$phpmailer = new MockPHPMailer(); 
 
 system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( $config_file_path ) . ' ' . $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 {
@@ -8 +7 @@
     // 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.' );
+        try {
+            if ( ! $this->PreSend() )
+                return false;
+
+            $this->mock_sent[] = array(
+                'to'     => $this->to,
+                'cc'     => $this->cc,
+                'bcc'    => $this->bcc,
+                'header' => $this->MIMEHeader,
+                'body'   => $this->MIMEBody,
+            );
+
+            return true;
+        } catch ( phpmailerException $e ) {
             return false;
         }
-
-        // Set whether the message is multipart/alternative
-        if( ! empty($this->AltBody) )
-            $this->ContentType = 'multipart/alternative';
-
-        $this->error_count = 0; // reset errors
-        $this->SetMessageType();
-        $header = $this->CreateHeader();
-        $body = $this->CreateBody();
-
-        if ( $body == '' ) {
-            $this->SetError( 'Message body empty' );
-            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

@@ -4 +4 @@
  * @group pluggable
  * @group mail
- * @ticket UT47
  */
 class Tests_Mail extends WP_UnitTestCase {
@@ -66 +65 @@
         $this->assertEquals($body, $GLOBALS['phpmailer']->mock_sent[0]['body']);
         $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'boundary="----=_Part_4892_25692638.1192452070893"') > 0);
-        $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'charset=""') > 0);
+        $this->assertTrue(strpos($GLOBALS['phpmailer']->mock_sent[0]['header'], 'charset=') > 0);
         unset( $_SERVER['SERVER_NAME'] );
     }