Ticket #28909: 28909.unit-test-vars.diff

tests/phpunit/tests/mail.php

@@ -1 +1 @@
 <?php
 /**
  * @group pluggable
  * @group mail
  */
 class Tests_Mail extends WP_UnitTestCase {
         function setUp() {
                 parent::setUp();
                 unset( $GLOBALS['phpmailer']->mock_sent );
         }
 
+        function test_wp_mail_break_it() {
+                $content = str_repeat( 'A', 1000 );
+                wp_mail( "admin@example.org", 'Looong line testing', $content);
+        }
+
         function test_wp_mail_custom_boundaries() {
                 $to = 'user@example.com';
                 $subject = 'Test email with custom boundaries';
                 $headers  = '' . "\n";
                 $headers .= 'MIME-Version: 1.0' . "\n";
                 $headers .= 'Content-Type: multipart/mixed; boundary="----=_Part_4892_25692638.1192452070893"' . "\n";
                 $headers .= "\n";
                 $body  = "\n";
                 $body .= '------=_Part_4892_25692638.1192452070893' . "\n";
                 $body .= 'Content-Type: text/plain; charset=ISO-8859-1' . "\n";
                 $body .= 'Content-Transfer-Encoding: 7bit' . "\n";
                 $body .= 'Content-Disposition: inline' . "\n";
                 $body .= "\n";
                 $body .= 'Here is a message with an attachment of a binary file.' . "\n";
                 $body .= "\n";

tests/phpunit/includes/mock-mailer.php

@@ -1 +1 @@
 <?php
 require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
 
 class MockPHPMailer extends PHPMailer {
         var $mock_sent = array();
 
+        function preSend() {
+                $this->Encoding = '8bit';
+                parent::preSend();
+        }
+
         /**
-         * Override send() so mail isn't actually sent.
+         * Override postSend() so mail isn't actually sent.
          */
-        function send() {
-                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,
-                        );
+        function postSend() {
+                $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;
-                }
+                return true;
         }
 }

tests/phpunit/includes/testcase.php

@@ -569 +569 @@
          */
         protected function _microtime_to_float($microtime ){
                 $time_array = explode( ' ', $microtime );
                 return array_sum( $time_array );
         }
 
         /**
          * When `wp_mail()` is called, make sure `$_SERVER['SERVER_NAME']` is faked.
          *
          * @since 4.3.0
          *
          * @param array $args `wp_mail()` arguments.
          * @return array $args
          */
         public function set_wp_mail_globals( $args ) {
+                global $phpmailer;
+                // Reset the MockMailer on each new wp_mail() call
+                //$phpmailer = new MockPHPMailer();
+
                 if ( ! isset( $_SERVER['SERVER_NAME'] ) ) {
                         $_SERVER['SERVER_NAME'] = 'example.com';
                         add_action( 'phpmailer_init', array( $this, 'tear_down_wp_mail_globals' ) );
                 }
 
                 return $args;
         }
 
         /**
          * Tear down the faked `$_SERVER['SERVER_NAME']` global used in `wp_mail()`.
          *
          * @since 4.3.0
          */
         public function tear_down_wp_mail_globals() {
                 unset( $_SERVER['SERVER_NAME'] );