aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-08-23 22:16:23 +0200
committerGitHub <noreply@github.com>2021-08-23 22:16:23 +0200
commitf94ec1f80cb458846345cd7e6c0f76eb61f2368f (patch)
tree6fd2c123ecfa5112be5ab4b634bfbe259c66650a
parentd84eed7fb0016d9b4a329aedde9af36a04901e1e (diff)
parent6d2430701c9af8029da34140a9e2176b9e904f9c (diff)
downloadnextcloud-server-f94ec1f80cb458846345cd7e6c0f76eb61f2368f.tar.gz
nextcloud-server-f94ec1f80cb458846345cd7e6c0f76eb61f2368f.zip
Merge pull request #28568 from nextcloud/fix/stable22-failing-user-controller-tests
[stable22] fix UserController tests
-rw-r--r--apps/provisioning_api/tests/Controller/UsersControllerTest.php27
1 files changed, 27 insertions, 0 deletions
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index 238bac34307..cc638c89a63 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -1755,6 +1755,15 @@ class UsersControllerTest extends TestCase {
}
public function testEditUserAdminUserSelfEditChangeValidQuota() {
+ $this->config
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->willReturnCallback(function ($appid, $key, $default) {
+ if ($key === 'max_quota') {
+ return '-1';
+ }
+ return null;
+ });
$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
$loggedInUser
->expects($this->any())
@@ -1834,6 +1843,15 @@ class UsersControllerTest extends TestCase {
}
public function testEditUserAdminUserEditChangeValidQuota() {
+ $this->config
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->willReturnCallback(function ($appid, $key, $default) {
+ if ($key === 'max_quota') {
+ return '-1';
+ }
+ return null;
+ });
$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
$loggedInUser
->expects($this->any())
@@ -2082,6 +2100,15 @@ class UsersControllerTest extends TestCase {
}
public function testEditUserSubadminUserAccessible() {
+ $this->config
+ ->expects($this->once())
+ ->method('getAppValue')
+ ->willReturnCallback(function ($appid, $key, $default) {
+ if ($key === 'max_quota') {
+ return '-1';
+ }
+ return null;
+ });
$loggedInUser = $this->getMockBuilder(IUser::class)->disableOriginalConstructor()->getMock();
$loggedInUser
->expects($this->any())