audrius/server-backend
1
0
Fork 0
mirror of https://github.com/OCA/server-backend.git synced 2025-02-18 09:52:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #335 into 17.0

Browse Source 
Signed-off-by sebalix
This commit is contained in:
OCA-git-bot
2025-01-28 14:04:00 +00:00
parent 77db565b25 b2fd4424fc
commit 03bef8572c
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.oca/oca-port/blacklist/base_user_role.json Normal file
View File

@@ -0,0 +1,6 @@
{
"pull_requests": {
"OCA/server-backend#237": "(auto) Nothing to port from PR #237",
"OCA/server-backend#262": "(auto) Nothing to port from PR #262"
}
}

56
base_user_role/tests/test_user_role.py
View File

@@ -137,12 +137,9 @@ class TestUserRole(TransactionCase):
self.assertEqual(user_group_ids, role_group_ids) self.assertEqual(user_group_ids, role_group_ids)
def test_role_unlink(self): def test_role_unlink(self):
# Get role1 groups # Get role1 and role2 groups
role1_group_ids = ( role1_groups = self.role1_id.trans_implied_ids | self.role1_id.group_id
self.role1_id.implied_ids.ids + self.role1_id.trans_implied_ids.ids role2_groups = self.role2_id.trans_implied_ids | self.role2_id.group_id
)
role1_group_ids.append(self.role1_id.group_id.id)
role1_group_ids = sorted(set(role1_group_ids))
# Configure the user with role1 and role2 # Configure the user with role1 and role2
self.user_id.write( self.user_id.write(
@@ -153,22 +150,24 @@ class TestUserRole(TransactionCase):
] ]
} }
) )
# Check user has groups from role1 and role2
self.assertLessEqual(role1_groups, self.user_id.groups_id)
self.assertLessEqual(role2_groups, self.user_id.groups_id)
# Remove role2 # Remove role2
self.role2_id.unlink() self.role2_id.unlink()
user_group_ids = sorted({group.id for group in self.user_id.groups_id}) # Check user has groups from only role1
self.assertEqual(user_group_ids, role1_group_ids) self.assertLessEqual(role1_groups, self.user_id.groups_id)
self.assertFalse(role2_groups <= self.user_id.groups_id)
# Remove role1 # Remove role1
self.role1_id.unlink() self.role1_id.unlink()
user_group_ids = sorted({group.id for group in self.user_id.groups_id}) # Check user has no groups from role1 and role2
self.assertEqual(user_group_ids, []) self.assertFalse(role1_groups <= self.user_id.groups_id)
self.assertFalse(role2_groups <= self.user_id.groups_id)
def test_role_line_unlink(self): def test_role_line_unlink(self):
# Get role1 groups # Get role1 and role2 groups
role1_group_ids = ( role1_groups = self.role1_id.trans_implied_ids | self.role1_id.group_id
self.role1_id.implied_ids.ids + self.role1_id.trans_implied_ids.ids role2_groups = self.role2_id.trans_implied_ids | self.role2_id.group_id
)
role1_group_ids.append(self.role1_id.group_id.id)
role1_group_ids = sorted(set(role1_group_ids))
# Configure the user with role1 and role2 # Configure the user with role1 and role2
self.user_id.write( self.user_id.write(
@@ -179,18 +178,23 @@ class TestUserRole(TransactionCase):
] ]
} }
) )
# Check user has groups from role1 and role2
self.assertLessEqual(role1_groups, self.user_id.groups_id)
self.assertLessEqual(role2_groups, self.user_id.groups_id)
# Remove role2 from the user # Remove role2 from the user
self.user_id.role_line_ids.filtered( self.user_id.role_line_ids.filtered(
lambda rl: rl.role_id.id == self.role2_id.id lambda rl: rl.role_id.id == self.role2_id.id
).unlink() ).unlink()
user_group_ids = sorted({group.id for group in self.user_id.groups_id}) # Check user has groups from only role1
self.assertEqual(user_group_ids, role1_group_ids) self.assertLessEqual(role1_groups, self.user_id.groups_id)
self.assertFalse(role2_groups <= self.user_id.groups_id)
# Remove role1 from the user # Remove role1 from the user
self.user_id.role_line_ids.filtered( self.user_id.role_line_ids.filtered(
lambda rl: rl.role_id.id == self.role1_id.id lambda rl: rl.role_id.id == self.role1_id.id
).unlink() ).unlink()
user_group_ids = sorted({group.id for group in self.user_id.groups_id}) # Check user has no groups from role1 and role2
self.assertEqual(user_group_ids, []) self.assertFalse(role1_groups <= self.user_id.groups_id)
self.assertFalse(role2_groups <= self.user_id.groups_id)
def test_default_user_roles(self): def test_default_user_roles(self):
self.default_user.write( self.default_user.write(
@@ -257,16 +261,16 @@ class TestUserRole(TransactionCase):
self.assertFalse(self.user_id.show_alert) self.assertFalse(self.user_id.show_alert)
def test_group_groups_into_role(self): def test_group_groups_into_role(self):
user_group_ids = [group.id for group in self.user_id.groups_id] user_group_ids = self.user_id.groups_id.ids
# Check that there is not a role with name: Test Role # Check that there is not a role with name: Test Role
self.assertFalse(self.role_model.search([("name", "=", "Test Role")])) self.assertFalse(self.role_model.search([("name", "=", "Test Role")]))
# Call create_role function to group groups into a role # Call create_role function to group groups into a role
wizard = self.wiz_model.with_context(active_ids=user_group_ids).create( wizard = self.wiz_model.with_context(active_ids=user_group_ids).create(
{"name": "Test Role"} {"name": "Test Role"}
) )
wizard.create_role() res = wizard.create_role()
# Check that a role with name: Test Role has been created # Check that a role with name: Test Role has been created
new_role = self.role_model.search([("name", "=", "Test Role")]) new_role = self.env[res["res_model"]].browse(res["res_id"])
self.assertTrue(new_role) self.assertEqual(new_role.name, "Test Role")
# Check that the role has the correct groups # Check that the role has the correct groups (even if the order is not equal)
self.assertEqual(new_role.implied_ids.ids, user_group_ids) self.assertEqual(set(new_role.implied_ids.ids), set(user_group_ids))