[Mailer] fix merge of MailgunApiTransportTest

This commit is contained in:
Nicolas Grekas 2020-03-23 14:03:11 +01:00
parent 8ace1c1f94
commit e1eb80c9f2

View File

@ -61,7 +61,7 @@ class MailgunApiTransportTest extends TestCase
$deliveryTime = (new \DateTimeImmutable('2020-03-20 13:01:00'))->format(\DateTimeImmutable::RFC2822); $deliveryTime = (new \DateTimeImmutable('2020-03-20 13:01:00'))->format(\DateTimeImmutable::RFC2822);
$email = new Email(); $email = new Email();
$email->getHeaders()->addTextHeader('X-Mailgun-Variables', $json); $email->getHeaders()->addTextHeader('h:X-Mailgun-Variables', $json);
$email->getHeaders()->addTextHeader('h:foo', 'foo-value'); $email->getHeaders()->addTextHeader('h:foo', 'foo-value');
$email->getHeaders()->addTextHeader('t:text', 'text-value'); $email->getHeaders()->addTextHeader('t:text', 'text-value');
$email->getHeaders()->addTextHeader('o:deliverytime', $deliveryTime); $email->getHeaders()->addTextHeader('o:deliverytime', $deliveryTime);
@ -104,7 +104,7 @@ class MailgunApiTransportTest extends TestCase
$deliveryTime = (new \DateTimeImmutable('2020-03-20 13:01:00'))->format(\DateTimeImmutable::RFC2822); $deliveryTime = (new \DateTimeImmutable('2020-03-20 13:01:00'))->format(\DateTimeImmutable::RFC2822);
$email = new Email(); $email = new Email();
$email->getHeaders()->addTextHeader('bar', 'bar-value'); $email->getHeaders()->addTextHeader('h:bar', 'bar-value');
$envelope = new Envelope(new Address('alice@system.com'), [new Address('bob@system.com')]); $envelope = new Envelope(new Address('alice@system.com'), [new Address('bob@system.com')]);
@ -176,7 +176,7 @@ class MailgunApiTransportTest extends TestCase
->text('Hello There!'); ->text('Hello There!');
$this->expectException(HttpTransportException::class); $this->expectException(HttpTransportException::class);
$this->expectExceptionMessage('Unable to send an email: "i\'m a teapot" (code 418).'); $this->expectExceptionMessage('Unable to send an email: i\'m a teapot (code 418).');
$transport->send($mail); $transport->send($mail);
} }
@ -184,7 +184,7 @@ class MailgunApiTransportTest extends TestCase
{ {
$json = json_encode(['foo' => 'bar']); $json = json_encode(['foo' => 'bar']);
$email = new Email(); $email = new Email();
$email->getHeaders()->addTextHeader('X-Mailgun-Variables', $json); $email->getHeaders()->addTextHeader('h:X-Mailgun-Variables', $json);
$email->getHeaders()->add(new TagHeader('password-reset')); $email->getHeaders()->add(new TagHeader('password-reset'));
$email->getHeaders()->add(new MetadataHeader('Color', 'blue')); $email->getHeaders()->add(new MetadataHeader('Color', 'blue'));
$email->getHeaders()->add(new MetadataHeader('Client-ID', '12345')); $email->getHeaders()->add(new MetadataHeader('Client-ID', '12345'));