mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

phpunit min version is 4.8 

Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-10-06 14:07:32 +02:00
parent ccc29a3da2
commit b130a0ee09
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
1 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/Settings/Controller/MailSettingsControllerTest.php
View File

@ -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(