Fix user_ldap unit testsenh/user_ldap-add-command-to-unmap-groups

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

3 files changed, 13 insertions, 14 deletions

diff --git a/apps/user_ldap/lib/GroupPluginManager.php b/apps/user_ldap/lib/GroupPluginManager.php
index 8403ad4e4be..5999409cdba 100644
--- a/apps/user_ldap/lib/GroupPluginManager.php
+++ b/apps/user_ldap/lib/GroupPluginManager.php
@@ -88,7 +88,7 @@ class GroupPluginManager {
 	}
 
 	public function canDeleteGroup(): bool {
-		return !$this->suppressDeletion && ($this->which[GroupInterface::DELETE_GROUP] !== null);
+		return !$this->suppressDeletion && $this->implementsActions(GroupInterface::DELETE_GROUP);
 	}
 
 	/**
@@ -102,11 +102,10 @@ class GroupPluginManager {
 
 	/**
 	 * Delete a group
-	 * @param string $gid Group Id of the group to delete
-	 * @return bool
+	 *
 	 * @throws \Exception
 	 */
-	public function deleteGroup($gid) {
+	public function deleteGroup(string $gid): bool {
 		$plugin = $this->which[GroupInterface::DELETE_GROUP];
 
 		if ($plugin) {
diff --git a/apps/user_ldap/tests/GroupLDAPPluginTest.php b/apps/user_ldap/tests/GroupLDAPPluginTest.php
index b55f57990a0..660608d6b1f 100644
--- a/apps/user_ldap/tests/GroupLDAPPluginTest.php
+++ b/apps/user_ldap/tests/GroupLDAPPluginTest.php
@@ -84,7 +84,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->createGroup('group');
 	}
 
-	
+
 	public function testCreateGroupNotRegistered() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('No plugin implements createGroup in this LDAP Backend.');
@@ -108,13 +108,13 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 			->method('deleteGroup')
 			->with(
 				$this->equalTo('group')
-			);
+			)->willReturn(true);
 
 		$pluginManager->register($plugin);
-		$pluginManager->deleteGroup('group');
+		$this->assertTrue($pluginManager->deleteGroup('group'));
 	}
 
-	
+
 	public function testDeleteGroupNotRegistered() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('No plugin implements deleteGroup in this LDAP Backend.');
@@ -145,7 +145,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->addToGroup('uid', 'gid');
 	}
 
-	
+
 	public function testAddToGroupNotRegistered() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('No plugin implements addToGroup in this LDAP Backend.');
@@ -176,7 +176,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->removeFromGroup('uid', 'gid');
 	}
 
-	
+
 	public function testRemoveFromGroupNotRegistered() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('No plugin implements removeFromGroup in this LDAP Backend.');
@@ -207,7 +207,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->countUsersInGroup('gid', 'search');
 	}
 
-	
+
 	public function testCountUsersInGroupNotRegistered() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('No plugin implements countUsersInGroup in this LDAP Backend.');
@@ -237,7 +237,7 @@ class GroupLDAPPluginTest extends \Test\TestCase {
 		$pluginManager->getGroupDetails('gid');
 	}
 
-	
+
 	public function testgetGroupDetailsNotRegistered() {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('No plugin implements getGroupDetails in this LDAP Backend.');
diff --git a/apps/user_ldap/tests/Group_LDAPTest.php b/apps/user_ldap/tests/Group_LDAPTest.php
index f8327c0776c..6204c22cb9e 100644
--- a/apps/user_ldap/tests/Group_LDAPTest.php
+++ b/apps/user_ldap/tests/Group_LDAPTest.php
@@ -1092,7 +1092,7 @@ class Group_LDAPTest extends TestCase {
 		$pluginManager->expects($this->once())
 			->method('deleteGroup')
 			->with('gid')
-			->willReturn('result');
+			->willReturn(true);
 
 		$mapper = $this->getMockBuilder(GroupMapping::class)
 			->setMethods(['unmap'])
@@ -1108,7 +1108,7 @@ class Group_LDAPTest extends TestCase {
 
 		$ldap = new GroupLDAP($access, $pluginManager);
 
-		$this->assertEquals($ldap->deleteGroup('gid'), 'result');
+		$this->assertTrue($ldap->deleteGroup('gid'));
 	}