From e1eb80c9f23036f41dabcee5f95291ffbf812ab3 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 23 Mar 2020 14:03:11 +0100
Subject: [PATCH] [Mailer] fix merge of MailgunApiTransportTest

---
 .../Mailgun/Tests/Transport/MailgunApiTransportTest.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
index e5ccda0396..fddd9154d1 100644
--- a/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
+++ b/src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php
@@ -61,7 +61,7 @@ class MailgunApiTransportTest extends TestCase
         $deliveryTime = (new \DateTimeImmutable('2020-03-20 13:01:00'))->format(\DateTimeImmutable::RFC2822);
 
         $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('t:text', 'text-value');
         $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);
 
         $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')]);
 
@@ -176,7 +176,7 @@ class MailgunApiTransportTest extends TestCase
             ->text('Hello There!');
 
         $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);
     }
 
@@ -184,7 +184,7 @@ class MailgunApiTransportTest extends TestCase
     {
         $json = json_encode(['foo' => 'bar']);
         $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 MetadataHeader('Color', 'blue'));
         $email->getHeaders()->add(new MetadataHeader('Client-ID', '12345'));