aboutsummaryrefslogtreecommitdiffstats
path: root/tests/Settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-08-16 20:51:43 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-08-16 20:51:43 +0200
commitfd95985a21297d6fe8e2c8234a263154923e1def (patch)
tree5b01def7986dcb5a52d0a89b231f9178e4a68715 /tests/Settings
parent0cb8f74cd174ac264b8ef27b0759cce0845bd402 (diff)
downloadnextcloud-server-fd95985a21297d6fe8e2c8234a263154923e1def.tar.gz
nextcloud-server-fd95985a21297d6fe8e2c8234a263154923e1def.zip
Remove IE8 support in CertificateController
* Also fix getMock warnings in tests
Diffstat (limited to 'tests/Settings')
-rw-r--r--tests/Settings/Controller/CertificateControllerTest.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/Settings/Controller/CertificateControllerTest.php b/tests/Settings/Controller/CertificateControllerTest.php
index c9ea2a4024f..36b5715e734 100644
--- a/tests/Settings/Controller/CertificateControllerTest.php
+++ b/tests/Settings/Controller/CertificateControllerTest.php
@@ -51,11 +51,11 @@ class CertificateControllerTest extends \Test\TestCase {
public function setUp() {
parent::setUp();
- $this->request = $this->getMock('\OCP\IRequest');
- $this->certificateManager = $this->getMock('\OCP\ICertificateManager');
- $this->systemCertificateManager = $this->getMock('\OCP\ICertificateManager');
- $this->l10n = $this->getMock('\OCP\IL10N');
- $this->appManager = $this->getMock('OCP\App\IAppManager');
+ $this->request = $this->getMockBuilder('\OCP\IRequest')->getMock();
+ $this->certificateManager = $this->getMockBuilder('\OCP\ICertificateManager')->getMock();
+ $this->systemCertificateManager = $this->getMockBuilder('\OCP\ICertificateManager')->getMock();
+ $this->l10n = $this->getMockBuilder('\OCP\IL10N')->getMock();
+ $this->appManager = $this->getMockBuilder('OCP\App\IAppManager')->getMock();
$this->certificateController = $this->getMockBuilder('OC\Settings\Controller\CertificateController')
->setConstructorArgs(
@@ -90,7 +90,7 @@ class CertificateControllerTest extends \Test\TestCase {
'name' => 'goodCertificate.crt',
];
- $certificate = $this->getMock('\OCP\ICertificate');
+ $certificate = $this->getMockBuilder('\OCP\ICertificate')->getMock();
$certificate
->expects($this->once())
->method('getName')