Closes Taskana#2563 - Add assignment of workbasket access items via p…

…ermissions
MM1277 · Apr 22, 2024 · b9437c8 · b9437c8
1 parent cb2f404
commit b9437c8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java
@@ -40,7 +40,7 @@ public abstract class AbstractAccTest {
   public static final String GROUP_2_DN =
       "cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA";
   public static final String PERM_1_DN =
-      "permission=perm:userleads,cn=permissions,ou=test,o=taskana";
+      "perm:userleads";
 
   protected static TaskanaConfiguration taskanaConfiguration;
   protected static TaskanaEngine taskanaEngine;

diff --git a/...pring-example-common/src/test/java/pro/taskana/example/ldap/LdapEmptySearchRootsTest.java b/...pring-example-common/src/test/java/pro/taskana/example/ldap/LdapEmptySearchRootsTest.java
@@ -31,8 +31,7 @@ void should_FindPermissionsForUser_When_UserIdIsProvided() throws Exception {
         ldapClient.searchPermissionsAccessIdHas("user-1-2");
     assertThat(permissions)
         .extracting(AccessIdRepresentationModel::getAccessId)
-        .containsExactlyInAnyOrder("permission=perm:userleads,cn=permissions,ou=test,o=taskana",
-            "permission=perm:other,cn=permissions,ou=test,o=taskana");
+        .containsExactlyInAnyOrder("perm:userleads", "perm:other");
   }
 
   @Test

diff --git a/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/ldap/LdapTest.java b/rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/ldap/LdapTest.java
@@ -27,7 +27,7 @@ void should_FindAllUsersAndGroupAndPermissions_When_SearchWithSubstringOfName()
         .extracting(AccessIdRepresentationModel::getAccessId)
         .containsExactlyInAnyOrder(
             "teamlead-1", "teamlead-2", "cn=ksc-teamleads,cn=groups,ou=test,o=taskana",
-            "permission=perm:userleads,cn=permissions,ou=test,o=taskana");
+            "perm:userleads");
   }
 
   @Test
@@ -55,8 +55,8 @@ void should_FindPermissionsForUser_When_UserIdIsProvided() throws Exception {
         ldapClient.searchPermissionsAccessIdHas("user-1-2");
     assertThat(permissions)
         .extracting(AccessIdRepresentationModel::getAccessId)
-        .containsExactlyInAnyOrder("permission=perm:other,cn=permissions,ou=test,o=taskana",
-            "permission=perm:userleads,cn=permissions,ou=test,o=taskana");
+        .containsExactlyInAnyOrder("perm:other,cn=permissions",
+            "perm:userleads");
   }
 
   @Test

diff --git a/.../taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java b/.../taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerIntTest.java
@@ -196,7 +196,7 @@ void should_ValidateAccessIdWithEqualsFilterAndReturnAccessIdsOfPermissionsAcces
         .extracting(AccessIdRepresentationModel::getAccessId)
         .usingElementComparator(String.CASE_INSENSITIVE_ORDER)
         .containsExactlyInAnyOrder(
-            "permission=perm:userleads,cn=permissions,ou=Test,O=TASKANA");
+            "perm:userleads");
   }
 
   @Test