Add testcases for pipe mode

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
nextcloud · Nov 29, 2018 · 4a2c56b · 4a2c56b
1 parent 92675a6
commit 4a2c56b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 14 deletions.
diff --git a/tests/Settings/Controller/MailSettingsControllerTest.php b/tests/Settings/Controller/MailSettingsControllerTest.php
@@ -74,6 +74,7 @@ public function testSetMailSettings() {
 					'mail_smtpauthtype' => 'NTLM',
 					'mail_smtpauth' => 1,
 					'mail_smtpport' => '25',
+					'mail_sendmailmode' => null,
 				]],
 				[[
 					'mail_domain' => 'nextcloud.com',
@@ -86,6 +87,7 @@ public function testSetMailSettings() {
 					'mail_smtpport' => '25',
 					'mail_smtpname' => null,
 					'mail_smtppassword' => null,
+					'mail_sendmailmode' => null,
 				]]
 			);
 
@@ -98,7 +100,8 @@ public function testSetMailSettings() {
 			'mx.nextcloud.org',
 			'NTLM',
 			1,
-			'25'
+			'25',
+			null
 		);
 		$this->assertSame(Http::STATUS_OK, $response->getStatus());
 
@@ -111,7 +114,8 @@ public function testSetMailSettings() {
 			'mx.nextcloud.org',
 			'NTLM',
 			0,
-			'25'
+			'25',
+			null
 		);
 		$this->assertSame(Http::STATUS_OK, $response->getStatus());
 

diff --git a/tests/lib/Mail/MailerTest.php b/tests/lib/Mail/MailerTest.php
@@ -48,30 +48,54 @@ public function setUp() {
 		);
 	}
 
-	public function testGetSendMailInstanceSendMail() {
+	/**
+	 * @return array
+	 */
+	public function sendmailModeProvider(): array {
+		return [
+			'smtp' => ['smtp', ' -bs'],
+			'pipe' => ['pipe', ' -t'],
+		];
+	}
+
+	/**
+	 * @dataProvider sendmailModeProvider
+	 * @param $sendmailMode
+	 * @param $binaryParam
+	 */
+	public function testGetSendmailInstanceSendMail($sendmailMode, $binaryParam) {
 		$this->config
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('getSystemValue')
-			->with('mail_smtpmode', 'smtp')
-			->will($this->returnValue('sendmail'));
+			->will($this->returnValueMap([
+				['mail_smtpmode', 'smtp', 'sendmail'],
+				['mail_sendmailmode', 'smtp', $sendmailMode],
+			]));
 
 		$path = \OC_Helper::findBinaryPath('sendmail');
 		if ($path === null) {
 			$path = '/usr/sbin/sendmail';
 		}
 
-		$expected = new \Swift_SendmailTransport($path . ' -bs');
+		$expected = new \Swift_SendmailTransport($path . $binaryParam);
 		$this->assertEquals($expected, self::invokePrivate($this->mailer, 'getSendMailInstance'));
 	}
 
-	public function testGetSendMailInstanceSendMailQmail() {
+	/**
+	 * @dataProvider sendmailModeProvider
+	 * @param $sendmailMode
+	 * @param $binaryParam
+	 */
+	public function testGetSendmailInstanceSendMailQmail($sendmailMode, $binaryParam) {
 		$this->config
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('getSystemValue')
-			->with('mail_smtpmode', 'smtp')
-			->will($this->returnValue('qmail'));
+			->will($this->returnValueMap([
+				['mail_smtpmode', 'smtp', 'qmail'],
+				['mail_sendmailmode', 'smtp', $sendmailMode],
+			]));
 
-		$this->assertEquals(new \Swift_SendmailTransport('/var/qmail/bin/sendmail -bs'), self::invokePrivate($this->mailer, 'getSendMailInstance'));
+		$this->assertEquals(new \Swift_SendmailTransport('/var/qmail/bin/sendmail' . $binaryParam), self::invokePrivate($this->mailer, 'getSendMailInstance'));
 	}
 
 	public function testGetInstanceDefault() {
@@ -83,8 +107,10 @@ public function testGetInstanceDefault() {
 	public function testGetInstanceSendmail() {
 		$this->config
 			->method('getSystemValue')
-			->with('mail_smtpmode', 'smtp')
-			->willReturn('sendmail');
+			->will($this->returnValueMap([
+				['mail_smtpmode', 'smtp', 'sendmail'],
+				['mail_sendmailmode', 'smtp', 'smtp'],
+			]));
 
 		$mailer = self::invokePrivate($this->mailer, 'getInstance');
 		$this->assertInstanceOf(\Swift_Mailer::class, $mailer);

diff --git a/tests/lib/Settings/Admin/MailTest.php b/tests/lib/Settings/Admin/MailTest.php
@@ -95,6 +95,11 @@ public function testGetForm() {
 			->method('getSystemValue')
 			->with('mail_smtppassword', '')
 			->willReturn('mypassword');
+		$this->config
+			->expects($this->at(10))
+			->method('getSystemValue')
+			->with('mail_sendmailmode', 'smtp')
+			->willReturn('smtp');
 
 		$expected = new TemplateResponse(
 			'settings',
@@ -111,6 +116,7 @@ public function testGetForm() {
 				'mail_smtpauth'         => true,
 				'mail_smtpname'         => 'smtp.sender.com',
 				'mail_smtppassword'     => '********',
+				'mail_sendmailmode'		=> 'smtp',
 			],
 			''
 		);