From: Simon L <szaimen@e.mail.de>
Date: Fri, 23 Jun 2023 15:12:45 +0000 (+0200)
Subject: try to fix tests
X-Git-Tag: v28.0.0beta1~828^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1cb81ae625f75d0d2a6bf13c9a3b39365dc6d215;p=nextcloud-server.git

try to fix tests

Signed-off-by: Simon L <szaimen@e.mail.de>
---

diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
index ba1d52f4baf..5ffba939284 100644
--- a/tests/lib/Mail/MailerTest.php
+++ b/tests/lib/Mail/MailerTest.php
@@ -240,14 +240,17 @@ class MailerTest extends TestCase {
 		$this->config->method('getSystemValue')
 			->willReturnMap([
 				['mail_smtpstreamoptions', [], ['foo' => 1]],
-				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
-				['mail_smtpport', 25, 25],
-				['mail_smtptimeout', 10, 10],
 			]);
 		$this->config->method('getSystemValueString')
 			->willReturnMap([
 				['mail_smtpmode', 'smtp', 'smtp'],
 				['overwrite.cli.url', '', ''],
+				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
+			]);
+		$this->config->method('getSystemValueInt')
+			->willReturnMap([
+				['mail_smtpport', 25, 25],
+				['mail_smtptimeout', 10, 10],
 			]);
 		$mailer = self::invokePrivate($this->mailer, 'getInstance');
 		/** @var EsmtpTransport $transport */
@@ -261,15 +264,19 @@ class MailerTest extends TestCase {
 		$this->config->method('getSystemValue')
 			->willReturnMap([
 				['mail_smtpstreamoptions', [], 'bar'],
-				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
-				['mail_smtpport', 25, 25],
-				['mail_smtptimeout', 10, 10],
 			]);
 		$this->config->method('getSystemValueString')
 			->willReturnMap([
 				['mail_smtpmode', 'smtp', 'smtp'],
 				['overwrite.cli.url', '', ''],
+				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
+			]);
+		$this->config->method('getSystemValueInt')
+			->willReturnMap([
+				['mail_smtpport', 25, 25],
+				['mail_smtptimeout', 10, 10],
 			]);
+
 		$mailer = self::invokePrivate($this->mailer, 'getInstance');
 		/** @var EsmtpTransport $transport */
 		$transport = self::invokePrivate($mailer, 'transport');
@@ -278,16 +285,16 @@ class MailerTest extends TestCase {
 	}
 
 	public function testLocalDomain(): void {
-		$this->config->method('getSystemValue')
-			->willReturnMap([
-				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
-				['mail_smtpport', 25, 25],
-				['mail_smtptimeout', 10, 10],
-			]);
 		$this->config->method('getSystemValueString')
 			->willReturnMap([
 				['mail_smtpmode', 'smtp', 'smtp'],
 				['overwrite.cli.url', '', 'https://some.valid.url.com:8080'],
+				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
+			]);
+		$this->config->method('getSystemValueInt')
+			->willReturnMap([
+				['mail_smtpport', 25, 25],
+				['mail_smtptimeout', 10, 10],
 			]);
 
 		/** @var SymfonyMailer $mailer */
@@ -301,16 +308,16 @@ class MailerTest extends TestCase {
 	}
 
 	public function testLocalDomainInvalidUrl(): void {
-		$this->config->method('getSystemValue')
-			->willReturnMap([
-				['mail_smtpport', 25, 25],
-				['mail_smtptimeout', 10, 10],
-				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
-			]);
 		$this->config->method('getSystemValueString')
 			->willReturnMap([
 				['mail_smtpmode', 'smtp', 'smtp'],
 				['overwrite.cli.url', '', 'https:only.slash.does.not.work:8080'],
+				['mail_smtphost', '127.0.0.1', '127.0.0.1'],
+			]);
+		$this->config->method('getSystemValueInt')
+			->willReturnMap([
+				['mail_smtpport', 25, 25],
+				['mail_smtptimeout', 10, 10],
 			]);
 
 		/** @var SymfonyMailer $mailer */