diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-04-19 01:34:59 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-19 01:34:59 +0300 |
commit | 1b1397b2eb7d10dec6a217ba01d59507540785fb (patch) | |
tree | 4f041a53ce1e7eda7dd7c74b14dc95afab7337ea /tests | |
parent | d39f00a1ed0013d09ab2c90bdef16a359b7998c6 (diff) | |
parent | 7f454fea8e374c3bea173f4b98dbcee41a005384 (diff) |
Merge pull request #9232 from nextcloud/12-9205
[stable12] Provide an option to disable HTML emails
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/Mail/MailerTest.php | 5 | ||||
-rw-r--r-- | tests/lib/Mail/MessageTest.php | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php index f647b966f1f..abe3054afd6 100644 --- a/tests/lib/Mail/MailerTest.php +++ b/tests/lib/Mail/MailerTest.php @@ -95,6 +95,11 @@ class MailerTest extends TestCase { } public function testCreateMessage() { + $this->config + ->expects($this->any()) + ->method('getSystemValue') + ->with('mail_send_plaintext_only', false) + ->will($this->returnValue(false)); $this->assertInstanceOf('\OC\Mail\Message', $this->mailer->createMessage()); } diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php index 691168ce24c..646341b0df5 100644 --- a/tests/lib/Mail/MessageTest.php +++ b/tests/lib/Mail/MessageTest.php @@ -9,6 +9,7 @@ namespace Test\Mail; use OC\Mail\Message; +use OCP\Mail\IEMailTemplate; use Swift_Message; use Test\TestCase; @@ -36,7 +37,7 @@ class MessageTest extends TestCase { $this->swiftMessage = $this->getMockBuilder('\Swift_Message') ->disableOriginalConstructor()->getMock(); - $this->message = new Message($this->swiftMessage); + $this->message = new Message($this->swiftMessage, false); } /** |