mirror/PHPMailer
0
0
Fork 0
mirror of https://github.com/PHPMailer/PHPMailer.git synced 2024-09-20 01:52:15 +02:00
Code

ReplyToGetSetClearTest: improve the test with duplicate IDN addresses

Browse Source 
This commit:
* Renames the `testDuplicateIDNRemoved()` method to `testNoDuplicateReplyToAddresses()`.
* Removes the call to `clearReplyTos()` at the start of the function as it is redundant. Each test gets a fresh instance of the PHPMailer class.
* Adds a number of additional assertions to the method to test the enqueuing and duplication removal in more depth.
* Ensures that all assertions are accompanied by a "failure" message so it can more easily be determined which assertion failed (in case of failure).

Includes adding `@covers` tags for the test.
This commit is contained in:
jrfnl 2021-07-12 00:48:47 +02:00
parent 06244ad942
commit 535f6338a9
1 changed files with 81 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
test/PHPMailer/ReplyToGetSetClearTest.php
View File

@ -301,34 +301,103 @@ final class ReplyToGetSetClearTest extends PreSendTestCase
}
/**
* Tests removal of duplicate recipients and reply-tos.
* Tests that non-exact duplicate reply-to addresses do get enqueued (IDN),
* but don't get added (IDN converted to punycode + non-IDN).
*
* @covers \PHPMailer\PHPMailer\PHPMailer::addOrEnqueueAnAddress
* @covers \PHPMailer\PHPMailer\PHPMailer::addAnAddress
*
* @requires extension mbstring
* @requires function idn_to_ascii
*/
public function testDuplicateIDNRemoved()
public function testNoDuplicateReplyToAddresses()
{
$this->Mail->clearReplyTos();
$this->Mail->CharSet = PHPMailer::CHARSET_UTF8;
self::assertTrue($this->Mail->addReplyTo('test+replyto@françois.ch'));
self::assertFalse($this->Mail->addReplyTo('test+replyto@françois.ch'));
self::assertTrue($this->Mail->addReplyTo('test+replyto@FRANÇOIS.CH'));
self::assertFalse($this->Mail->addReplyTo('test+replyto@FRANÇOIS.CH'));
self::assertTrue($this->Mail->addReplyTo('test+replyto@xn--franois-xxa.ch'));
self::assertFalse($this->Mail->addReplyTo('test+replyto@xn--franois-xxa.ch'));
self::assertFalse($this->Mail->addReplyTo('test+replyto@XN--FRANOIS-XXA.CH'));
self::assertTrue(
$this->Mail->addReplyTo('test+replyto@françois.ch', 'UTF8 domain'),
'Initial address + name not queued'
);
self::assertFalse(
$this->Mail->addReplyTo('test+replyto@françois.ch'),
'Duplicate address should not have been queued'
);
// For the queue, a duplicate address in a different case is accepted.
self::assertTrue(
$this->Mail->addReplyTo('test+replyto@FRANÇOIS.CH'),
'Duplicate address, different case address not queued'
);
self::assertFalse(
$this->Mail->addReplyTo('test+replyto@FRANÇOIS.CH'),
'Duplicate address, different case should not have been queued twice'
);
// An address in punycode does not go into the queue, but gets added straight away.
self::assertTrue(
$this->Mail->addReplyTo('test+replyto@xn--franois-xxa.ch'),
'Punycode address, no name not added'
);
self::assertFalse(
$this->Mail->addReplyTo('test+replyto@xn--franois-xxa.ch', 'Punycode domain'),
'Duplicate punycode address should not have been added, no matter that this one has a name'
);
self::assertFalse(
$this->Mail->addReplyTo('test+replyto@XN--FRANOIS-XXA.CH'),
'Duplicate punycode address, different case should not have been added'
);
// The one accepted punycode address should already be lined up.
self::assertCount(1, $this->Mail->getReplyToAddresses(), 'Addresses added did not match expected count of 1');
// Check that the non-punycode addresses were added to the queue correctly.
$queue = $this->getPropertyValue($this->Mail, 'ReplyToQueue');
self::assertIsArray($queue, 'Queue is not an array');
self::assertCount(2, $queue, 'Queue does not contain exactly 2 entries');
self::assertArrayHasKey(
'test+replyto@françois.ch',
$queue,
'Queue does not contain an entry for the lowercase address'
);
self::assertArrayHasKey(
'test+replyto@FRANÇOIS.CH',
$queue,
'Queue does not contain an entry for the uppercase address'
);
$this->buildBody();
self::assertTrue($this->Mail->preSend(), $this->Mail->ErrorInfo);
//There should be only one "Reply-To" address.
// There should be only one "Reply-To" address after preSend().
self::assertCount(
1,
$this->Mail->getReplyToAddresses(),
'Bad count of "reply-to" addresses'
);
$expectedAddress = 'test+replyto@xn--franois-xxa.ch';
$retrieved = $this->Mail->getReplyToAddresses();
self::assertCount(1, $retrieved, 'Stored addresses after preSend() is not 1');
// Verify that the registered reply-to address is the initially added lowercase punycode one.
self::assertArrayHasKey(
$expectedAddress,
$retrieved,
'ReplyTo property does not contain an entry with this address as the key'
);
self::assertCount(
2,
$retrieved[$expectedAddress],
'ReplyTo array for this address does not contain exactly two array items'
);
self::assertSame(
$expectedAddress,
$retrieved[$expectedAddress][0],
'ReplyTo array for this address does not contain added address'
);
self::assertSame(
'',
$retrieved[$expectedAddress][1],
'ReplyTo array for this address does not contain added name'
);
}
public function testGivenIdnAddress_addReplyTo_returns_true()