Replaced imap with mailpit and refreshed the test. #13219
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,67 @@ | ||
| --TEST-- | ||
| Bug #72964 (White space not unfolded for CC/Bcc headers) | ||
| --SKIPIF-- | ||
| <?php | ||
| if (getenv("SKIP_SLOW_TESTS")) die('skip slow test'); | ||
| require_once __DIR__.'/mail_windows_skipif.inc'; | ||
| ?> | ||
| --INI-- | ||
| SMTP=localhost | ||
| smtp_port=1025 | ||
| sendmail_from=from@example.com | ||
| --FILE-- | ||
| <?php | ||
|
|
||
| require_once __DIR__.'/mailpit_utils.inc'; | ||
|
|
||
| $to = 'bug72964_to@example.com'; | ||
| $from = ini_get('sendmail_from'); | ||
| $cc = ['bug72964_cc_1@example.com', 'bug72964_cc_2@example.com']; | ||
| $bcc = ['bug72964_bcc_1@example.com', 'bug72964_bcc_2@example.com']; | ||
| $subject = bin2hex(random_bytes(16)); | ||
| $message = 'hello'; | ||
| $headers = "From: {$from}\r\n" | ||
| . "Cc: {$cc[0]},\r\n\t{$cc[1]}\r\n" | ||
| . "Bcc: {$bcc[0]},\r\n {$bcc[1]}\r\n"; | ||
|
|
||
| $res = mail($to, $subject, $message, $headers); | ||
|
|
||
| if ($res !== true) { | ||
| exit("Unable to send the email.\n"); | ||
| } else { | ||
| echo "Sent the email.\n"; | ||
| } | ||
|
|
||
| $res = searchEmailByToAddress($to); | ||
|
|
||
| if (mailCheckResponse($res, $from, $to, $subject, $message)) { | ||
| echo "Received the email.\n"; | ||
|
|
||
| $ccAddresses = getCcAddresses($res); | ||
| if (in_array($cc[0], $ccAddresses, true)) { | ||
| echo "cc1 Received the email.\n"; | ||
| } | ||
|
|
||
| if (in_array($cc[1], $ccAddresses, true)) { | ||
| echo "cc2 Received the email.\n"; | ||
| } | ||
|
|
||
| $bccAddresses = getBccAddresses($res); | ||
| if (in_array($bcc[0], $bccAddresses, true)) { | ||
| echo "bcc1 Received the email.\n"; | ||
| } | ||
|
|
||
| if (in_array($bcc[1], $bccAddresses, true)) { | ||
| echo "bcc2 Received the email."; | ||
| } | ||
|
|
||
| deleteEmail($res); | ||
| } | ||
| ?> | ||
| --EXPECT-- | ||
| Sent the email. | ||
| Received the email. | ||
| cc1 Received the email. | ||
| cc2 Received the email. | ||
| bcc1 Received the email. | ||
| bcc2 Received the email. | ||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,80 +1,57 @@ | ||||||
| --TEST-- | ||||||
| Bug #80706 (Headers after Bcc headers may be ignored) | ||||||
| --SKIPIF-- | ||||||
| <?php | ||||||
| if (getenv("SKIP_SLOW_TESTS")) die('skip slow test'); | ||||||
| require_once __DIR__.'/mail_windows_skipif.inc'; | ||||||
| ?> | ||||||
| --INI-- | ||||||
| SMTP=localhost | ||||||
| smtp_port=1025 | ||||||
| sendmail_from=from@example.com | ||||||
| --FILE-- | ||||||
| <?php | ||||||
|
|
||||||
| require_once __DIR__.'/mailpit_utils.inc'; | ||||||
|
|
||||||
| $to = 'bug80706_to@example.com'; | ||||||
| $from = ini_get('sendmail_from'); | ||||||
| $bcc = 'bug80706_bcc@exsample.com'; | ||||||
| $subject = bin2hex(random_bytes(16)); | ||||||
| $message = 'hello'; | ||||||
| $xMailer = 'bug80706_x_mailer'; | ||||||
| $headers = "From: {$from}\r\n" | ||||||
| . "Bcc: {$bcc}\r\n" | ||||||
| . "X-Mailer: {$xMailer}"; | ||||||
|
|
||||||
| $res = mail($to, $subject, $message, $headers); | ||||||
|
|
||||||
| if ($res !== true) { | ||||||
| exit("Unable to send the email.\n"); | ||||||
| } else { | ||||||
| echo "Sent the email.\n"; | ||||||
|
There was a problem hiding this comment. NIT:
Suggested change
and not much point to have else block for this... |
||||||
| } | ||||||
|
|
||||||
| $res = searchEmailByToAddress($to); | ||||||
|
|
||||||
| if (mailCheckResponse($res, $from, $to, $subject, $message)) { | ||||||
| echo "Received the email.\n"; | ||||||
|
There was a problem hiding this comment. NIT:
Suggested change
just for consistency with |
||||||
|
|
||||||
| $bccAddresses = getBccAddresses($res); | ||||||
| if (in_array($bcc, $bccAddresses, true)) { | ||||||
| echo "bcc Received the email.\n"; | ||||||
|
There was a problem hiding this comment. NIT: This doesn't exactly tests that BCC received the email but more that BCC is set, right? There was a problem hiding this comment. Right. Maybe I should test that the email arrived correctly. There was a problem hiding this comment. yeah and might make sense to do the same for CC. Btw. shouldn't BCC be excluded from the original delivered email? There was a problem hiding this comment. Oops, I was careless. mailpit (and mailhog) is like an SMTP dummy, so I may not be able to check the behavior on the receiving side. This test checks "sent mail", not received mail. There was a problem hiding this comment. Yeah but it's the sender who should send multiple emails. See https://stackoverflow.com/a/2750359 . So I would expect mailpit to have multiple emails received though. Might be worth to try to send BCC email with sendmail to see if it's behaving the same. There was a problem hiding this comment. Yes but we need to verify that data is sent correctly. In this case it means that multiple Lines 525 to 614 in 5da8335 The client actually strips BCC but seems that mailpit probably adds it back axllent/mailpit@9c8329a If it's the case, it seems to me that mailpit might be good more for testing the actual email messages rather than making sure that client works as expected. For that it's maybe better to keep the actual real server and possibly just only replace imap client to check it out. There was a problem hiding this comment. That makes sense. It's already late today, so I'll try it tomorrow. There was a problem hiding this comment. I have done some checking but only CLI clients seem to be like complete CLI apps (e.g. mutt and alpine) but didn't find anything that would not be probably ideal. But then I found also this project: https://github.com/nodemailer/wildduck which offers API. I guess it can work just with SMTP mailserver but we already got so maybe that would be a better option. We would basically just replace usage of imap ext with calls to this service that could check the same thing potentially. There was a problem hiding this comment. thank you. mailpit is a dummy SMTP server, so I may need something else to actually send. If we want to test both sending and receiving behavior, things can get a little complicated. I'll look into it a little more too. There was a problem hiding this comment. In previous tests, the sending/receiving server was the hmail server, and the IMAP extension was acting as an IMAP/POP3 client to the hmail server. wildduck apparently primarily functions as a receiving server, so it needs to be able to receive emails for tests, which can get quite complicated. (In fact, if I look at the documentation, there will be instructions to configure DNS.) I'll continue investigating. |
||||||
| } | ||||||
|
|
||||||
| $headers = getHeaders($res); | ||||||
| if ($headers['X-Mailer'][0] === $xMailer) { | ||||||
| echo "The specified x-Mailer exists."; | ||||||
| } | ||||||
|
|
||||||
| deleteEmail($res); | ||||||
| } | ||||||
| ?> | ||||||
| --EXPECT-- | ||||||
| Sent the email. | ||||||
| Received the email. | ||||||
| bcc Received the email. | ||||||
| The specified x-Mailer exists. | ||||||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it enough to just clear a single email - wouldn't be better to just always clear all emails. That should be also added to CLEAN section in case of failure so nothing is left there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was honestly confused about this too.
Deleting all emails causes problems with parallel tests, but aren't these tests ever run in parallel?
Also, I was hesitant about the CLEAN section because I would have to use the API several times to delete just one email.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I forgot that unlike mailhog, mailpit can be easily deleted. I can use the CLEAN section.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Related to other comments, this is data for outgoing emails, so even if there are multiple destinations, there will only be one email.