Merge branch '14.0' into 14.0-base_user_role_edit_broken

This commit is contained in:
beau sebastien
2021-01-27 15:52:50 +01:00
committed by GitHub
80 changed files with 676 additions and 1208 deletions

View File

@@ -48,9 +48,6 @@ class TestUserRole(TransactionCase):
self.role2_id = self.role_model.create(vals)
self.company1 = self.env.ref("base.main_company")
self.company2 = self.env["res.company"].create({"name": "company2"})
self.user_id.write(
{"company_ids": [(4, self.company1.id, 0), (4, self.company2.id, 0)]}
)
def test_role_1(self):
self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role1_id.id})]})
@@ -173,58 +170,6 @@ class TestUserRole(TransactionCase):
roles = self.role_model.browse([self.role1_id.id, self.role2_id.id])
self.assertEqual(user.role_ids, roles)
def test_user_role_different_company(self):
self.user_id.write({"company_id": self.company1.id})
self.user_id.write(
{
"role_line_ids": [
(
0,
0,
{"role_id": self.role2_id.id, "company_id": self.company2.id},
)
]
}
)
# Check that user does not have any groups
self.assertEqual(self.user_id.groups_id, self.env["res.groups"].browse())
def test_user_role_same_company(self):
self.user_id.write({"company_id": self.company1.id})
self.user_id.write(
{
"role_line_ids": [
(
0,
0,
{"role_id": self.role1_id.id, "company_id": self.company1.id},
)
]
}
)
user_group_ids = sorted({group.id for group in self.user_id.groups_id})
role_group_ids = self.role1_id.trans_implied_ids.ids
role_group_ids.append(self.role1_id.group_id.id)
role_group_ids = sorted(set(role_group_ids))
# Check that user have groups implied by role 1
self.assertEqual(user_group_ids, role_group_ids)
def test_user_role_no_company(self):
self.user_id.write({"company_id": self.company1.id})
self.user_id.write(
{
"role_line_ids": [
(0, 0, {"role_id": self.role2_id.id, "company_id": False})
]
}
)
user_group_ids = sorted({group.id for group in self.user_id.groups_id})
role_group_ids = self.role2_id.trans_implied_ids.ids
role_group_ids.append(self.role2_id.group_id.id)
role_group_ids = sorted(set(role_group_ids))
# Check that user have groups implied by role 2
self.assertEqual(user_group_ids, role_group_ids)
def test_update_role(self):
self.role1_id.write({"name": "foo", "comment": "FOO"})
self.assertEqual(self.role1_id.group_id.name, "foo")