Ticket #23291: 23291-unit-tests.3.diff

tests/mail.php

@@ -223 +223 @@
                 // Fatal errors
                 $this->assertFalse( wp_mail( 'invalid.address', 'subject', 'body', '', array() ) );
         }
+
+        /**
+         * @ticket 23291
+         */
+        function test_wp_mail_return_value_with_wp_error() {
+                global $phpmailer;
+                $phpmailer = new MockPHPMailer( true ); // recreate the mailer with exceptions turned on
+
+                // No errors
+                $this->assertTrue( wp_mail( 'valid-address@example.net', 'subject', 'body' ), true );
+
+                // Non-fatal errors
+                $result = wp_mail( 'valid-address@example.org', 'subject', 'body', "Cc: invalid_address\nBcc: another_invalid_address", array( '/this/file/does/not/exist' ), true );
+                $this->assertWPError( $result );
+                $this->assertCount( 3, $result->get_error_codes() );
+                $this->assertContains( 'mailer_add_cc', $result->get_error_codes() );
+                $this->assertContains( 'mailer_add_bcc', $result->get_error_codes() );
+                $this->assertContains( 'mailer_add_attachment', $result->get_error_codes() );
+                $this->assertNotContains( 'mailer_send', $result->get_error_codes() );
+
+                // Fatal error
+                $result = wp_mail( 'invalid.address', 'subject', 'body', '', array(), true );
+                $this->assertWPError( $result );
+                $this->assertCount( 2, $result->get_error_codes() );
+                $this->assertContains( 'mailer_add_address', $result->get_error_codes() );
+                $this->assertContains( 'mailer_send', $result->get_error_codes() );
+        }
 }

includes/mock-mailer.php

@@ -20 +20 @@
 
                         return true;
                 } catch ( phpmailerException $e ) {
+                        if ( $this->exceptions ) {
+                                throw $e;
+                        }
                         return false;
                 }
         }