Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

2 files changed, 7 insertions, 3 deletions

diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
index f647b966f1f..b0955a5d2fe 100644
--- a/tests/lib/Mail/MailerTest.php
+++ b/tests/lib/Mail/MailerTest.php
@@ -133,6 +133,10 @@ class MailerTest extends TestCase {
 	}
 
 	public function testCreateEMailTemplate() {
+		$this->config->method('getSystemValue')
+			->with('mail_template_class', '')
+			->willReturnArgument(1);
+
 		$this->assertSame(EMailTemplate::class, get_class($this->mailer->createEMailTemplate('tests.MailerTest')));
 	}
 }
diff --git a/tests/lib/Mail/MessageTest.php b/tests/lib/Mail/MessageTest.php
index 691168ce24c..78fd5f1bb8b 100644
--- a/tests/lib/Mail/MessageTest.php
+++ b/tests/lib/Mail/MessageTest.php
@@ -30,7 +30,7 @@ class MessageTest extends TestCase {
 		);
 	}
 
-	function setUp() {
+	public function setUp() {
 		parent::setUp();
 
 		$this->swiftMessage = $this->getMockBuilder('\Swift_Message')
@@ -79,9 +79,9 @@ class MessageTest extends TestCase {
 		$this->swiftMessage
 			->expects($this->once())
 			->method('getReplyTo')
-			->will($this->returnValue(['lukas@owncloud.com']));
+			->willReturn('lukas@owncloud.com');
 
-		$this->assertSame(['lukas@owncloud.com'], $this->message->getReplyTo());
+		$this->assertSame('lukas@owncloud.com', $this->message->getReplyTo());
 	}
 
 	public function testSetTo() {