From 7ce895bf5e0531b96b2cf0692b9da3814fb742f8 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 10 Jan 2016 12:49:43 +0100 Subject: Use HTML email for 2FA Related to #1490 --- .../UserBundle/Tests/Mailer/AuthCodeMailerTest.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php') diff --git a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php index 61e960f9..857cdcbe 100644 --- a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php +++ b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php @@ -27,7 +27,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase { protected $mailer; protected $spool; - protected $translator; + protected $twig; protected function setUp() { @@ -38,12 +38,11 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase ); $this->mailer = new \Swift_Mailer($transport); - $this->translator = new Translator('en'); - $this->translator->addLoader('array', new ArrayLoader()); - $this->translator->addResource('array', array( - 'auth_code.mailer.subject' => 'auth_code subject', - 'auth_code.mailer.body' => 'Hi %user%, here is the code: %code% and the support: %support%', - ), 'en', 'wallabag_user'); + $this->twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => ' +{% block subject %}subject{% endblock %} +{% block body_html %}html body{% endblock %} +{% block body_text %}text body{% endblock %} +'))); } public function testSendEmail() @@ -56,7 +55,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase $authCodeMailer = new AuthCodeMailer( $this->mailer, - $this->translator, + $this->twig, 'nobody@test.io', 'wallabag test', 'http://0.0.0.0' @@ -69,7 +68,8 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase $msg = $this->spool->getMessages()[0]; $this->assertArrayHasKey('test@wallabag.io', $msg->getTo()); $this->assertEquals(array('nobody@test.io' => 'wallabag test'), $msg->getFrom()); - $this->assertEquals('auth_code subject', $msg->getSubject()); - $this->assertContains('Hi Bob, here is the code: 666666 and the support: http://0.0.0.0', $msg->toString()); + $this->assertEquals('subject', $msg->getSubject()); + $this->assertContains('text body', $msg->toString()); + $this->assertContains('html body', $msg->toString()); } } -- cgit v1.2.3 From d1f1333f481a6814bb310c934b798d9f594f0b04 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 10 Jan 2016 13:01:00 +0100 Subject: CS --- src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php') diff --git a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php index 857cdcbe..fbd7fdd7 100644 --- a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php +++ b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php @@ -4,8 +4,6 @@ namespace Wallabag\UserBundle\Tests\Mailer; use Wallabag\UserBundle\Entity\User; use Wallabag\UserBundle\Mailer\AuthCodeMailer; -use Symfony\Component\Translation\Translator; -use Symfony\Component\Translation\Loader\ArrayLoader; /** * @see https://www.pmg.com/blog/integration-testing-swift-mailer/ -- cgit v1.2.3 From abd454c45633e335d9d63bcd250e760b968f8138 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jan 2016 17:43:10 +0100 Subject: Update HTML 2FA template Split paragraph in translation Inject wallabag_url for image in HTML template Remove username & password from config_dev.yml (null are already the default value) --- .../UserBundle/Tests/Mailer/AuthCodeMailerTest.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php') diff --git a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php index fbd7fdd7..e3f43a7e 100644 --- a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php +++ b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php @@ -36,11 +36,13 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase ); $this->mailer = new \Swift_Mailer($transport); - $this->twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => ' + $twigTemplate = <<twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => $twigTemplate))); } public function testSendEmail() @@ -56,6 +58,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase $this->twig, 'nobody@test.io', 'wallabag test', + 'http://0.0.0.0/support', 'http://0.0.0.0' ); @@ -67,7 +70,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase $this->assertArrayHasKey('test@wallabag.io', $msg->getTo()); $this->assertEquals(array('nobody@test.io' => 'wallabag test'), $msg->getFrom()); $this->assertEquals('subject', $msg->getSubject()); - $this->assertContains('text body', $msg->toString()); - $this->assertContains('html body', $msg->toString()); + $this->assertContains('text body http://0.0.0.0/support', $msg->toString()); + $this->assertContains('html body 666666', $msg->toString()); } } -- cgit v1.2.3