diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-10-06 14:07:32 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2016-10-06 14:07:32 +0200 |
| commit | b130a0ee09f3f6868dc49f1ed4e2cfff88a37c40 (patch) | |
| tree | a3ccd211f008fbf41ec8456b8a5f78d26c791a8d | |
| parent | ccc29a3da2f32c361fd1d2e1fede83b863798690 (diff) | |
| download | nextcloud-server-b130a0ee09f3f6868dc49f1ed4e2cfff88a37c40.tar.gz nextcloud-server-b130a0ee09f3f6868dc49f1ed4e2cfff88a37c40.zip | |
phpunit min version is 4.8
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | tests/Settings/Controller/MailSettingsControllerTest.php | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/tests/Settings/Controller/MailSettingsControllerTest.php b/tests/Settings/Controller/MailSettingsControllerTest.php index d7e2103aa8f..2012de886c8 100644 --- a/tests/Settings/Controller/MailSettingsControllerTest.php +++ b/tests/Settings/Controller/MailSettingsControllerTest.php @@ -62,37 +62,8 @@ class MailSettingsControllerTest extends \Test\TestCase { ->method('t') ->will($this->returnValue('Saved')); - /** - * FIXME: Use the following block once Jenkins uses PHPUnit >= 4.1 - */ - /* - $this->config - ->expects($this->exactly(15)) - ->method('setSystemValue') - ->withConsecutive( - array($this->equalTo('mail_domain'), $this->equalTo('owncloud.com')), - array($this->equalTo('mail_from_address'), $this->equalTo('demo@owncloud.com')), - array($this->equalTo('mail_smtpmode'), $this->equalTo('smtp')), - array($this->equalTo('mail_smtpsecure'), $this->equalTo('ssl')), - array($this->equalTo('mail_smtphost'), $this->equalTo('mx.owncloud.org')), - array($this->equalTo('mail_smtpauthtype'), $this->equalTo('NTLM')), - array($this->equalTo('mail_smtpauth'), $this->equalTo(1)), - array($this->equalTo('mail_smtpport'), $this->equalTo('25')), - array($this->equalTo('mail_domain'), $this->equalTo('owncloud.com')), - array($this->equalTo('mail_from_address'), $this->equalTo('demo@owncloud.com')), - array($this->equalTo('mail_smtpmode'), $this->equalTo('smtp')), - array($this->equalTo('mail_smtpsecure'), $this->equalTo('ssl')), - array($this->equalTo('mail_smtphost'), $this->equalTo('mx.owncloud.org')), - array($this->equalTo('mail_smtpauthtype'), $this->equalTo('NTLM')), - array($this->equalTo('mail_smtpport'), $this->equalTo('25')) - ); - */ - - /** @var \PHPUnit_Framework_MockObject_MockObject $config */ $this->config->expects($this->exactly(2)) - ->method('setSystemValues'); - /** - * FIXME: Use the following block once Jenkins uses PHPUnit >= 4.1 + ->method('setSystemValues') ->withConsecutive( [[ 'mail_domain' => 'owncloud.com', @@ -117,7 +88,6 @@ class MailSettingsControllerTest extends \Test\TestCase { 'mail_smtppassword' => null, ]] ); - */ // With authentication $response = $this->mailController->setMailSettings( |