diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-04-11 02:11:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-11 02:11:33 +0200 |
| commit | a65540138298c0adf29bb09ac5b5c1fc19d91ab5 (patch) | |
| tree | dc0e322aaf20c982dd0c4446b3af7e164b9661c5 | |
| parent | e302266a6ab824c7ee11219eb1ff9eeee0bd19a4 (diff) | |
| parent | a8d4b0688e92bd8272919137744ed08218b3a575 (diff) | |
| download | nextcloud-server-a65540138298c0adf29bb09ac5b5c1fc19d91ab5.tar.gz nextcloud-server-a65540138298c0adf29bb09ac5b5c1fc19d91ab5.zip | |
Merge pull request #9136 from nextcloud/bugfix/noid/fix_provisioning_integrationtests
The integrationtests expect a string
| -rw-r--r-- | apps/provisioning_api/lib/Controller/AUserData.php | 2 | ||||
| -rw-r--r-- | apps/provisioning_api/tests/Controller/UsersControllerTest.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 6c4967a6c3b..82ca98ced8c 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -92,7 +92,7 @@ abstract class AUserData extends OCSController { // Should be at least Admin Or SubAdmin! if( $this->groupManager->isAdmin($currentLoggedInUser->getUID()) || $this->groupManager->getSubAdmin()->isUserAccessible($currentLoggedInUser, $targetUserObject)) { - $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true') === 'true'; + $data['enabled'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'enabled', 'true'); } else { // Check they are looking up themselves if($currentLoggedInUser->getUID() !== $targetUserObject->getUID()) { diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php index 148879d6d91..6959f16f5cb 100644 --- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php +++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php @@ -732,7 +732,7 @@ class UsersControllerTest extends TestCase { ->expects($this->at(0)) ->method('getUserValue') ->with('UID', 'core', 'enabled', 'true') - ->will($this->returnValue('true')); + ->will($this->returnValue('true')); $this->config ->expects($this->at(1)) ->method('getUserValue') @@ -766,7 +766,7 @@ class UsersControllerTest extends TestCase { $expected = [ 'id' => 'UID', - 'enabled' => true, + 'enabled' => 'true', 'storageLocation' => '/var/www/newtcloud/data/UID', 'lastLogin' => 1521191471000, 'backend' => 'Database', @@ -881,7 +881,7 @@ class UsersControllerTest extends TestCase { $expected = [ 'id' => 'UID', - 'enabled' => true, + 'enabled' => 'true', 'storageLocation' => '/var/www/newtcloud/data/UID', 'lastLogin' => 1521191471000, 'backend' => 'Database', |