Skip to content

fix broken tests due to RBAC modification in commons #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/v3.3
Choose a base branch
from
Open

fix broken tests due to RBAC modification in commons #1061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions ...ationTest/kotlin/com/cosmotech/organization/service/OrganizationServiceIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
component = "organization",
roles =
mutableMapOf(
ROLE_NONE to mutableListOf<String>(),
ROLE_VIEWER to mutableListOf(PERMISSION_READ),
ROLE_USER to
mutableListOf(
Expand All @@ -646,6 +647,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
component = "workspace",
roles =
mutableMapOf(
ROLE_NONE to mutableListOf<String>(),
ROLE_VIEWER to mutableListOf(PERMISSION_READ),
ROLE_USER to
mutableListOf(
Expand All @@ -671,6 +673,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
component = "scenario",
roles =
mutableMapOf(
ROLE_NONE to mutableListOf<String>(),
ROLE_VIEWER to mutableListOf(PERMISSION_READ),
ROLE_EDITOR to
mutableListOf(
Expand Down Expand Up @@ -999,19 +1002,6 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
}
}

@Test
fun `addOrganizationAccessControl as resource admin (ROLE_NONE)`() {
assertThrows<CsmClientException> {
val name = "o-connector-test-1"
val organizationRegistered =
organizationApiService.registerOrganization(createTestOrganization(name))

val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_NONE)
organizationApiService.addOrganizationAccessControl(
organizationRegistered.id!!, otherUserACL)
}
}

@Test
fun `addOrganizationAccessControl as not resource admin and PERMISSION_WRITE_SECURITY`() {
assertDoesNotThrow {
Expand Down Expand Up @@ -1845,6 +1835,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
component = "organization",
roles =
mutableMapOf(
ROLE_NONE to mutableListOf<String>(),
ROLE_VIEWER to mutableListOf(PERMISSION_READ),
ROLE_USER to
mutableListOf(
Expand All @@ -1870,6 +1861,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
component = "workspace",
roles =
mutableMapOf(
ROLE_NONE to mutableListOf<String>(),
ROLE_VIEWER to mutableListOf(PERMISSION_READ),
ROLE_USER to
mutableListOf(
Expand All @@ -1895,6 +1887,7 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
component = "scenario",
roles =
mutableMapOf(
ROLE_NONE to mutableListOf<String>(),
ROLE_VIEWER to mutableListOf(PERMISSION_READ),
ROLE_EDITOR to
mutableListOf(
Expand Down Expand Up @@ -2298,19 +2291,6 @@ class OrganizationServiceIntegrationTest : CsmRedisTestBase() {
}
}

@Test
fun `addOrganizationAccessControl as resource admin (ROLE_NONE)`() {
assertThrows<CsmClientException> {
val name = "o-connector-test-1"
val organizationRegistered =
organizationApiService.registerOrganization(createTestOrganization(name))

val otherUserACL = OrganizationAccessControl(id = OTHER_TEST_USER_ID, role = ROLE_NONE)
organizationApiService.addOrganizationAccessControl(
organizationRegistered.id!!, otherUserACL)
}
}

@Test
fun `addOrganizationAccessControl as not resource admin and PERMISSION_WRITE_SECURITY`() {
assertDoesNotThrow {
Expand Down
Loading