Skip to content

Commit

Permalink
[FIX] test_access_rights: adapt tests
Browse files Browse the repository at this point in the history
Make the user be in at least one of the group employee, public or
portal to be more coherent with Odoo

closes odoo#125216

Related: odoo/enterprise#42628
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
  • Loading branch information
mart-e committed Jul 11, 2023
1 parent ce1a4a2 commit 884a56c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
12 changes: 7 additions & 5 deletions odoo/addons/test_access_rights/ir.model.access.csv
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
access_test_access_right_some_obj,access_test_access_right_some_obj,model_test_access_right_some_obj,,1,1,1,1
access_test_access_right_container,access_test_access_right_container,model_test_access_right_container,,1,1,1,1
access_test_access_right_parent,access_test_access_right_parent,model_test_access_right_parent,,1,1,1,1
access_test_access_right_child,access_test_access_right_child,model_test_access_right_child,,1,1,1,1
access_test_access_right_obj_categ,access_test_access_right_obj_categ,model_test_access_right_obj_categ,,1,1,1,1
access_test_access_right_some_obj_employee,access_test_access_right_some_obj,model_test_access_right_some_obj,base.group_user,1,1,1,1
access_test_access_right_some_obj_public,access_test_access_right_some_obj,model_test_access_right_some_obj,base.group_public,1,1,1,1
access_test_access_right_container_employee,access_test_access_right_container,model_test_access_right_container,base.group_user,1,1,1,1
access_test_access_right_container_public,access_test_access_right_container,model_test_access_right_container,base.group_public,1,1,1,1
access_test_access_right_parent,access_test_access_right_parent,model_test_access_right_parent,base.group_user,1,1,1,1
access_test_access_right_child,access_test_access_right_child,model_test_access_right_child,base.group_user,1,1,1,1
access_test_access_right_obj_categ,access_test_access_right_obj_categ,model_test_access_right_obj_categ,base.group_user,1,1,1,1
access_test_ticket_portal,access_test_ticket_portal,model_test_access_right_ticket,base.group_portal,1,0,0,0
access_test_ticket_user,access_test_ticket_user,model_test_access_right_ticket,base.group_user,1,1,1,1
2 changes: 1 addition & 1 deletion odoo/addons/test_access_rights/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SomeObj(models.Model):
categ_id = fields.Many2one('test_access_right.obj_categ')
company_id = fields.Many2one('res.company')
forbidden = fields.Integer(
groups='test_access_rights.test_group,!base.group_no_one,base.group_user,!base.group_public',
groups='test_access_rights.test_group,!base.group_no_one,!base.group_public',
default=5
)
forbidden2 = fields.Integer(groups='test_access_rights.test_group')
Expand Down
7 changes: 4 additions & 3 deletions odoo/addons/test_access_rights/tests/test_feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def setUp(self):
self.user = self.env['res.users'].create({
'login': 'bob',
'name': "Bob Bobman",
'groups_id': [Command.set(self.group2.ids)],
'groups_id': [Command.set([self.group2.id, self.env.ref('base.group_user').id])],
})


Expand Down Expand Up @@ -179,6 +179,7 @@ def _make_rule(self, name, domain, global_=False, attr='write'):

def test_local(self):
self._make_rule('rule 0', '[("val", "=", 42)]')
self.env.ref('base.group_no_one').write({'users': [Command.unlink(self.user.id)]})
with self.assertRaises(AccessError) as ctx:
self.record.write({'val': 1})
self.assertEqual(
Expand Down Expand Up @@ -421,7 +422,7 @@ def test_read(self):
Operation: read
User: %s
Fields:
- forbidden (allowed for groups 'User types / Internal User', 'Test Group'; forbidden for groups 'Extra Rights / Technical Features', 'User types / Public')"""
- forbidden (allowed for groups 'Test Group'; forbidden for groups 'Extra Rights / Technical Features', 'User types / Public')"""
% self.user.id
)

Expand Down Expand Up @@ -454,7 +455,7 @@ def test_write(self):
Operation: write
User: %s
Fields:
- forbidden (allowed for groups 'User types / Internal User', 'Test Group'; forbidden for groups 'Extra Rights / Technical Features', 'User types / Public')
- forbidden (allowed for groups 'Test Group'; forbidden for groups 'Extra Rights / Technical Features', 'User types / Public')
- forbidden2 (allowed for groups 'Test Group')"""
% self.user.id
)

0 comments on commit 884a56c

Please sign in to comment.