diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-18 16:11:29 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-04-18 16:11:29 +0200 |
| commit | fcaa315c96e236079d71236af67b5237e426b0f9 (patch) | |
| tree | 14080bc5d3a64f30b3fadbb888546a9e2298baf6 /tests/Settings | |
| parent | dfca672378d2083e498706c16b2a60981439cc0d (diff) | |
| download | nextcloud-server-fcaa315c96e236079d71236af67b5237e426b0f9.tar.gz nextcloud-server-fcaa315c96e236079d71236af67b5237e426b0f9.zip | |
Fix some more stuff
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests/Settings')
| -rw-r--r-- | tests/Settings/Controller/MailSettingsControllerTest.php | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/tests/Settings/Controller/MailSettingsControllerTest.php b/tests/Settings/Controller/MailSettingsControllerTest.php index b6131e80c5d..c8f9e476801 100644 --- a/tests/Settings/Controller/MailSettingsControllerTest.php +++ b/tests/Settings/Controller/MailSettingsControllerTest.php @@ -1,7 +1,10 @@ <?php /** - * @author Lukas Reschke - * @copyright 2014 Lukas Reschke lukas@owncloud.com + * @copyright 2014 Lukas Reschke lukas@nextcloud.com + * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> + * + * @author Lukas Reschke <lukas@statuscode.ch> + * @author Joas Schilling <coding@schilljs.com> * * This file is licensed under the Affero General Public License version 3 or * later. @@ -44,14 +47,16 @@ class MailSettingsControllerTest extends \Test\TestCase { $this->config = $this->createMock(IConfig::class); $this->userSession = $this->createMock(IUserSession::class); $this->mailer = $this->createMock(IMailer::class); + /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */ + $request = $this->createMock(IRequest::class); $this->mailController = new MailSettingsController( 'settings', - $this->createMock(IRequest::class), + $request, $this->l, $this->config, $this->userSession, $this->mailer, - 'no-reply@owncloud.com' + 'no-reply@nextcloud.com' ); } @@ -60,21 +65,21 @@ class MailSettingsControllerTest extends \Test\TestCase { ->method('setSystemValues') ->withConsecutive( [[ - 'mail_domain' => 'owncloud.com', - 'mail_from_address' => 'demo@owncloud.com', + 'mail_domain' => 'nextcloud.com', + 'mail_from_address' => 'demo@nextcloud.com', 'mail_smtpmode' => 'smtp', 'mail_smtpsecure' => 'ssl', - 'mail_smtphost' => 'mx.owncloud.org', + 'mail_smtphost' => 'mx.nextcloud.org', 'mail_smtpauthtype' => 'NTLM', 'mail_smtpauth' => 1, 'mail_smtpport' => '25', ]], [[ - 'mail_domain' => 'owncloud.com', - 'mail_from_address' => 'demo@owncloud.com', + 'mail_domain' => 'nextcloud.com', + 'mail_from_address' => 'demo@nextcloud.com', 'mail_smtpmode' => 'smtp', 'mail_smtpsecure' => 'ssl', - 'mail_smtphost' => 'mx.owncloud.org', + 'mail_smtphost' => 'mx.nextcloud.org', 'mail_smtpauthtype' => 'NTLM', 'mail_smtpauth' => null, 'mail_smtpport' => '25', @@ -85,11 +90,11 @@ class MailSettingsControllerTest extends \Test\TestCase { // With authentication $response = $this->mailController->setMailSettings( - 'owncloud.com', - 'demo@owncloud.com', + 'nextcloud.com', + 'demo@nextcloud.com', 'smtp', 'ssl', - 'mx.owncloud.org', + 'mx.nextcloud.org', 'NTLM', 1, '25' @@ -98,11 +103,11 @@ class MailSettingsControllerTest extends \Test\TestCase { // Without authentication (testing the deletion of the stored password) $response = $this->mailController->setMailSettings( - 'owncloud.com', - 'demo@owncloud.com', + 'nextcloud.com', + 'demo@nextcloud.com', 'smtp', 'ssl', - 'mx.owncloud.org', + 'mx.nextcloud.org', 'NTLM', 0, '25' |