mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5272 from nextcloud/stable12-5271 

[stable12] Also use IMailer interface to generate the email template
This commit is contained in:
Morris Jobke 2017-06-12 17:51:07 -05:00 committed by GitHub
parent 17bde8a79e d501b84c5a
commit a4cba7df69
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings/Mailer/NewUserMailHelper.php
View File

@ -115,11 +115,7 @@ class NewUserMailHelper {
$link = $this->urlGenerator->getAbsoluteURL('/'); $link = $this->urlGenerator->getAbsoluteURL('/');
} }
$emailTemplate = new EMailTemplate( $emailTemplate = $this->mailer->createEMailTemplate();
$this->themingDefaults,
$this->urlGenerator,
$this->l10n
);
$emailTemplate->addHeader(); $emailTemplate->addHeader();
$displayName = $user->getDisplayName(); $displayName = $user->getDisplayName();
$userName = $user->getUID(); $userName = $user->getUID();

8
tests/Settings/Mailer/NewUserMailHelperTest.php
View File

@ -21,6 +21,7 @@
namespace Tests\Settings\Mailer; namespace Tests\Settings\Mailer;
use OC\Mail\EMailTemplate;
use OCP\Mail\IEMailTemplate; use OCP\Mail\IEMailTemplate;
use OC\Mail\Message; use OC\Mail\Message;
use OC\Settings\Mailer\NewUserMailHelper; use OC\Settings\Mailer\NewUserMailHelper;
@ -62,6 +63,13 @@ class NewUserMailHelperTest extends TestCase {
$this->urlGenerator = $this->createMock(IURLGenerator::class); $this->urlGenerator = $this->createMock(IURLGenerator::class);
$this->l10n = $this->createMock(IL10N::class); $this->l10n = $this->createMock(IL10N::class);
$this->mailer = $this->createMock(IMailer::class); $this->mailer = $this->createMock(IMailer::class);
$template = new EMailTemplate(
$this->defaults,
$this->urlGenerator,
$this->l10n
);
$this->mailer->method('createEMailTemplate')
->will($this->returnValue($template));
$this->secureRandom = $this->createMock(ISecureRandom::class); $this->secureRandom = $this->createMock(ISecureRandom::class);
$this->timeFactory = $this->createMock(ITimeFactory::class); $this->timeFactory = $this->createMock(ITimeFactory::class);
$this->config = $this->createMock(IConfig::class); $this->config = $this->createMock(IConfig::class);