More fixed tests :)

diff --git a/apps/provisioning_api/tests/userstest.php b/apps/provisioning_api/tests/userstest.php
index 3ce13181b8d28186a8d1da103dc4f4e933dc6df0..859bc7228e9cedb1a40e47c4458ad0e7ab83117a 100644 (file)
--- a/apps/provisioning_api/tests/userstest.php
+++ b/apps/provisioning_api/tests/userstest.php
@@ -1015,6 +1015,9 @@ class UsersTest extends OriginalTest {
                        ->method('getUID')
                        ->will($this->returnValue('UserToEdit'));
                $targetUser = $this->getMock('\OCP\IUser');
+               $targetUser->expects($this->once())
+                       ->method('setQuota')
+                       ->with('2.9 MB');
                $this->userSession
                        ->expects($this->once())
                        ->method('getUser')
@@ -1029,10 +1032,6 @@ class UsersTest extends OriginalTest {
                        ->method('isAdmin')
                        ->with('UserToEdit')
                        ->will($this->returnValue(true));
-               $this->config
-                       ->expects($this->once())
-                       ->method('setUserValue')
-                       ->with('UserToEdit', 'files', 'quota', '2.9 MB');
 
                $expected = new \OC_OCS_Result(null, 100);
                $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
@@ -1071,6 +1070,9 @@ class UsersTest extends OriginalTest {
                        ->method('getUID')
                        ->will($this->returnValue('admin'));
                $targetUser = $this->getMock('\OCP\IUser');
+               $targetUser->expects($this->once())
+                       ->method('setQuota')
+                       ->with('2.9 MB');
                $this->userSession
                        ->expects($this->once())
                        ->method('getUser')
@@ -1092,10 +1094,6 @@ class UsersTest extends OriginalTest {
                        ->expects($this->once())
                        ->method('getSubAdmin')
                        ->will($this->returnValue($subAdminManager));
-               $this->config
-                       ->expects($this->once())
-                       ->method('setUserValue')
-                       ->with('UserToEdit', 'files', 'quota', '2.9 MB');
 
                $expected = new \OC_OCS_Result(null, 100);
                $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));
@@ -1108,6 +1106,9 @@ class UsersTest extends OriginalTest {
                        ->method('getUID')
                        ->will($this->returnValue('subadmin'));
                $targetUser = $this->getMock('\OCP\IUser');
+               $targetUser->expects($this->once())
+                       ->method('setQuota')
+                       ->with('2.9 MB');
                $this->userSession
                        ->expects($this->once())
                        ->method('getUser')
@@ -1129,10 +1130,6 @@ class UsersTest extends OriginalTest {
                        ->expects($this->once())
                        ->method('getSubAdmin')
                        ->will($this->returnValue($subAdminManager));
-               $this->config
-                       ->expects($this->once())
-                       ->method('setUserValue')
-                       ->with('UserToEdit', 'files', 'quota', '2.9 MB');
 
                $expected = new \OC_OCS_Result(null, 100);
                $this->assertEquals($expected, $this->api->editUser(['userid' => 'UserToEdit', '_put' => ['key' => 'quota', 'value' => '3042824']]));

diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php
index 046edf5896871199a6bba606be5b0a5035965ddc..ca8d81a4b791c37983ce60b308c884a1dbc455d6 100644 (file)
--- a/apps/user_ldap/tests/user/user.php
+++ b/apps/user_ldap/tests/user/user.php
@@ -210,13 +210,15 @@ class Test_User_User extends \Test\TestCase {
                                $this->equalTo('myquota'))
                        ->will($this->returnValue(array('42 GB')));
 
-               $config->expects($this->once())
-                       ->method('setUserValue')
-                       ->with($this->equalTo('alice'),
-                               $this->equalTo('files'),
-                               $this->equalTo('quota'),
-                               $this->equalTo('42 GB'))
-                       ->will($this->returnValue(true));
+               $user = $this->getMock('\OCP\IUser');
+               $user->expects($this->once())
+                       ->method('setQuota')
+                       ->with('42 GB');
+
+               $userMgr->expects($this->once())
+                       ->method('get')
+                       ->with('alice')
+                       ->will($this->returnValue($user));
 
                $uid = 'alice';
                $dn  = 'uid=alice,dc=foo,dc=bar';
@@ -253,13 +255,15 @@ class Test_User_User extends \Test\TestCase {
                                $this->equalTo('myquota'))
                        ->will($this->returnValue(false));
 
-               $config->expects($this->once())
-                       ->method('setUserValue')
-                       ->with($this->equalTo('alice'),
-                               $this->equalTo('files'),
-                               $this->equalTo('quota'),
-                               $this->equalTo('25 GB'))
-                       ->will($this->returnValue(true));
+               $user = $this->getMock('\OCP\IUser');
+               $user->expects($this->once())
+                       ->method('setQuota')
+                       ->with('25 GB');
+
+               $userMgr->expects($this->once())
+                       ->method('get')
+                       ->with('alice')
+                       ->will($this->returnValue($user));
 
                $uid = 'alice';
                $dn  = 'uid=alice,dc=foo,dc=bar';
@@ -296,13 +300,15 @@ class Test_User_User extends \Test\TestCase {
                                $this->equalTo('myquota'))
                        ->will($this->returnValue(array('27 GB')));
 
-               $config->expects($this->once())
-                       ->method('setUserValue')
-                       ->with($this->equalTo('alice'),
-                               $this->equalTo('files'),
-                               $this->equalTo('quota'),
-                               $this->equalTo('27 GB'))
-                       ->will($this->returnValue(true));
+               $user = $this->getMock('\OCP\IUser');
+               $user->expects($this->once())
+                       ->method('setQuota')
+                       ->with('27 GB');
+
+               $userMgr->expects($this->once())
+                       ->method('get')
+                       ->with('alice')
+                       ->will($this->returnValue($user));
 
                $uid = 'alice';
                $dn  = 'uid=alice,dc=foo,dc=bar';
@@ -408,13 +414,15 @@ class Test_User_User extends \Test\TestCase {
                $access->expects($this->never())
                        ->method('readAttribute');
 
-               $config->expects($this->once())
-                       ->method('setUserValue')
-                       ->with($this->equalTo('alice'),
-                               $this->equalTo('files'),
-                               $this->equalTo('quota'),
-                               $this->equalTo($readQuota))
-                       ->will($this->returnValue(true));
+               $user = $this->getMock('\OCP\IUser');
+               $user->expects($this->once())
+                       ->method('setQuota')
+                       ->with($readQuota);
+
+               $userMgr->expects($this->once())
+                       ->method('get')
+                       ->with('alice')
+                       ->will($this->returnValue($user));
 
                $uid = 'alice';
                $dn  = 'uid=alice,dc=foo,dc=bar';