Changeset 61547 for branches/6.9/tests/phpunit/tests/pluggable/wpMail.php

Timestamp:

01/28/2026 09:01:01 PM (3 months ago)

Author:

jorbin

Message:

General: Revert commit with accidental changes.

[61531] included both the intended change of [61480] and additional code. In order to provide as clean of a history as possible, this is being reverted and will be recommitted so that it only contains the correct code.

Unprops jorbin.

Follow up to [61531].

See #64350.
Props joedolson, westonruter, jonsurrell, desrosj.

Location:

branches/6.9

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/pluggable/wpMail.php (modified) (1 diff)

branches/6.9/tests/phpunit/tests/pluggable/wpMail.php

@@ -412 +412 @@
 
     /**
-     * Test that the Sender field in the SMTP envelope is not set by Core.
-     *
-     * Correctly setting the Sender requires knowledge that is not available
-     * to Core. An incorrect value will often lead to messages being rejected
-     * by the receiving MTA, so it's the admin's responsibility to
-     * set it correctly.
-     *
-     * @ticket 37736
-     */
-    public function test_wp_mail_sender_not_set() {
-        wp_mail( 'user@example.org', 'Testing the Sender field', 'The Sender field should not have been set.' );
-
-        $mailer = tests_retrieve_phpmailer_instance();
-
-        $this->assertSame( '', $mailer->Sender );
+     * Test that the Sender field in the SMTP envelope is set by Core.
+     *
+     * A missing Sender field can lead to messages failing DMARC SPF checks.
+     *
+     * @ticket 49687
+     */
+    public function test_wp_mail_sender_set() {
+        wp_mail( 'user@example.org', 'Testing the Sender field', 'The Sender field should have been set.' );
+
+        $mailer = tests_retrieve_phpmailer_instance();
+
+        $this->assertSame( 'wordpress@example.org', $mailer->Sender );
     }