Build CKEditor from source to disable more features

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

4 files changed, 19 insertions, 3 deletions

diff --git a/tests/Controller/AccountsControllerTest.php b/tests/Controller/AccountsControllerTest.php
index 93c283d4a..b5ef64b6a 100644
--- a/tests/Controller/AccountsControllerTest.php
+++ b/tests/Controller/AccountsControllerTest.php
@@ -426,7 +426,19 @@ class AccountsControllerTest extends TestCase {
 			->with($this->userId, $messageData, $replyData, null, null);
 		$expected = new JSONResponse();
 
-		$resp = $this->controller->send(13, 'sub', 'bod', 'to@d.com', '', '', null, base64_encode($folderId), $messageId, [], null);
+		$resp = $this->controller->send(
+			13,
+			'sub',
+			'bod',
+			'to@d.com',
+			'',
+			'',
+			true,
+			null,
+			base64_encode($folderId),
+			$messageId,
+			[],
+			null);
 
 		$this->assertEquals($expected, $resp);
 	}
diff --git a/tests/Db/MailAccountMapperTest.php b/tests/Db/MailAccountMapperTest.php
index 0609579ab..2278bbe96 100644
--- a/tests/Db/MailAccountMapperTest.php
+++ b/tests/Db/MailAccountMapperTest.php
@@ -68,6 +68,7 @@ class MailAccountMapperTest extends TestCase {
 		$this->account->setOutboundPassword('xxxx');
 		$this->account->setOutboundSslMode('ssl');
 		$this->account->setUserId('user12345');
+		$this->account->setEditorMode('plaintext');
 	}
 
 	public function testFind(){
diff --git a/tests/Db/MailAccountTest.php b/tests/Db/MailAccountTest.php
index ba95921b3..3c6d01558 100644
--- a/tests/Db/MailAccountTest.php
+++ b/tests/Db/MailAccountTest.php
@@ -23,7 +23,7 @@ namespace OCA\Mail\Db;
 
 use ChristophWurst\Nextcloud\Testing\TestCase;
 
-class TestMailAccount extends TestCase {
+class MailAccountTest extends TestCase {
 
 	public function testToAPI() {
 		$a = new MailAccount();
@@ -41,6 +41,7 @@ class TestMailAccount extends TestCase {
 		$a->setOutboundUser('spiderman');
 		$a->setOutboundPassword('xxxx');
 		$a->setOutboundSslMode('ssl');
+		$a->setEditorMode('html');
 
 		$this->assertEquals(array(
 			'accountId' => 12345,
@@ -55,6 +56,7 @@ class TestMailAccount extends TestCase {
 			'smtpUser' => 'spiderman',
 			'smtpSslMode' => 'ssl',
 			'signature' => null,
+			'editorMode' => 'html',
 			), $a->toJson());
 	}
 
@@ -72,6 +74,7 @@ class TestMailAccount extends TestCase {
 			'smtpUser' => 'spiderman',
 			'smtpSslMode' => 'ssl',
 			'signature' => null,
+			'editorMode' => null,
 		];
 		$a = new MailAccount($expected);
 		// TODO: fix inconsistency
diff --git a/tests/Integration/Service/MailTransmissionIntegrationTest.php b/tests/Integration/Service/MailTransmissionIntegrationTest.php
index 542be21de..e0176d1d3 100644
--- a/tests/Integration/Service/MailTransmissionIntegrationTest.php
+++ b/tests/Integration/Service/MailTransmissionIntegrationTest.php
@@ -193,7 +193,7 @@ class MailTransmissionIntegrationTest extends TestCase {
 	}
 
 	public function testSaveNewDraft() {
-		$message = NewMessageData::fromRequest($this->account, 'recipient@domain.com', null, null, 'greetings', 'hello there', []);
+		$message = NewMessageData::fromRequest($this->account, 'recipient@domain.com', null, null, 'greetings', 'hello there', [], false);
 		$uid = $this->transmission->saveDraft($message);
 		// There should be a new mailbox …
 		$this->assertMailboxExists('Drafts');