From 0801cdba7382688ae9d86e862e5523d4c577a5ff Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 13 Nov 2019 11:48:09 +0000 Subject: [PATCH 1/2] [FIX] base_user_role: Improve tests resiliency These 2 tests were checking the exact set of groups a user should have. If these tests are ran in a database where a module is previously installed which adds more groups to the base role, these exact group sets would be inexact, although the behavior that is being tested was actually properly working. With this patch, basically I'm testing if the user contains the groups from the roles, not the exact role set expected. It should work in integration scenarios. @Tecnativa TT20468 --- base_user_role/tests/test_user_role.py | 44 ++++++++++++++------------ 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py index 6f640227..86c9fd42 100644 --- a/base_user_role/tests/test_user_role.py +++ b/base_user_role/tests/test_user_role.py @@ -137,12 +137,9 @@ class TestUserRole(TransactionCase): self.assertEqual(user_group_ids, role_group_ids) def test_role_unlink(self): - # Get role1 groups - role1_group_ids = ( - self.role1_id.implied_ids.ids + self.role1_id.trans_implied_ids.ids - ) - role1_group_ids.append(self.role1_id.group_id.id) - role1_group_ids = sorted(set(role1_group_ids)) + # Get role1 and role2 groups + role1_groups = self.role1_id.trans_implied_ids | self.role1_id.group_id + role2_groups = self.role2_id.trans_implied_ids | self.role2_id.group_id # Configure the user with role1 and role2 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 self.role2_id.unlink() - user_group_ids = sorted({group.id for group in self.user_id.groups_id}) - self.assertEqual(user_group_ids, role1_group_ids) + # Check user has groups from only role1 + self.assertLessEqual(role1_groups, self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) # Remove role1 self.role1_id.unlink() - user_group_ids = sorted({group.id for group in self.user_id.groups_id}) - self.assertEqual(user_group_ids, []) + # Check user has no groups from role1 and role2 + self.assertFalse(role1_groups <= self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) def test_role_line_unlink(self): - # Get role1 groups - role1_group_ids = ( - self.role1_id.implied_ids.ids + self.role1_id.trans_implied_ids.ids - ) - role1_group_ids.append(self.role1_id.group_id.id) - role1_group_ids = sorted(set(role1_group_ids)) + # Get role1 and role2 groups + role1_groups = self.role1_id.trans_implied_ids | self.role1_id.group_id + role2_groups = self.role2_id.trans_implied_ids | self.role2_id.group_id # Configure the user with role1 and role2 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 self.user_id.role_line_ids.filtered( lambda rl: rl.role_id.id == self.role2_id.id ).unlink() - user_group_ids = sorted({group.id for group in self.user_id.groups_id}) - self.assertEqual(user_group_ids, role1_group_ids) + # Check user has groups from only role1 + self.assertLessEqual(role1_groups, self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) # Remove role1 from the user self.user_id.role_line_ids.filtered( lambda rl: rl.role_id.id == self.role1_id.id ).unlink() - user_group_ids = sorted({group.id for group in self.user_id.groups_id}) - self.assertEqual(user_group_ids, []) + # Check user has no groups from role1 and role2 + self.assertFalse(role1_groups <= self.user_id.groups_id) + self.assertFalse(role2_groups <= self.user_id.groups_id) def test_default_user_roles(self): self.default_user.write( From a4bc60ae791b2085deed3f2868a16344ed6db1fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Thu, 1 Feb 2024 13:17:46 +0100 Subject: [PATCH 2/2] [IMP] base_user_role: Improve tests to avoid false errors (ids in different order) --- base_user_role/tests/test_user_role.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base_user_role/tests/test_user_role.py b/base_user_role/tests/test_user_role.py index 86c9fd42..63444c01 100644 --- a/base_user_role/tests/test_user_role.py +++ b/base_user_role/tests/test_user_role.py @@ -261,16 +261,16 @@ class TestUserRole(TransactionCase): self.assertFalse(self.user_id.show_alert) 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 self.assertFalse(self.role_model.search([("name", "=", "Test Role")])) # Call create_role function to group groups into a role wizard = self.wiz_model.with_context(active_ids=user_group_ids).create( {"name": "Test Role"} ) - wizard.create_role() + res = wizard.create_role() # Check that a role with name: Test Role has been created - new_role = self.role_model.search([("name", "=", "Test Role")]) - self.assertTrue(new_role) - # Check that the role has the correct groups - self.assertEqual(new_role.implied_ids.ids, user_group_ids) + new_role = self.env[res["res_model"]].browse(res["res_id"]) + self.assertEqual(new_role.name, "Test Role") + # Check that the role has the correct groups (even if the order is not equal) + self.assertEqual(set(new_role.implied_ids.ids), set(user_group_ids))