[MERGE] forward port branch saas-11.4 up to 1199451606c

1 files changed, 9 insertions, 3 deletions

diff --git a/odoo/addons/base/tests/test_non_regression.py b/odoo/addons/base/tests/test_non_regression.py
index 1f75578079a..12faee0e1f0 100644
--- a/odoo/addons/base/tests/test_non_regression.py
+++ b/odoo/addons/base/tests/test_non_regression.py
@@ -8,8 +8,11 @@ from openerp.tests.common import TransactionCase
 
 class TestNR(TransactionCase):
     def test_issue26036(self):
+        # Coming from https://github.com/odoo/odoo/pull/26036
         U = self.env["res.users"]
         G = self.env["res.groups"]
+        group_user = self.env.ref('base.group_user')
+        group_no_one = self.env.ref('base.group_no_one')
 
         group_A = G.create({"name": "A"})
         group_AA = G.create({"name": "AA", "implied_ids": [(6, 0, [group_A.id])]})
@@ -17,10 +20,13 @@ class TestNR(TransactionCase):
         group_BB = G.create({"name": "BB", "implied_ids": [(6, 0, [group_B.id])]})
         group_C = G.create({"name": "C"})
 
-        user_a = U.create({"name": "a", "login": "a", "groups_id": [(6, 0, [group_AA.id])]})
+        user_a = U.create({"name": "a", "login": "a", "groups_id": [(6, 0, [group_AA.id, group_user.id])]})
         user_b = U.create({"name": "b", "login": "b", "groups_id": [(6, 0, [group_BB.id])]})
 
+        self.assertEqual(user_a.groups_id, (group_AA + group_A + group_user + group_no_one))
+
         (user_a + user_b).write({"groups_id": [(4, group_C.id)]})
 
-        self.assertEqual(user_a.groups_id, (group_AA + group_A + group_C))
-        self.assertEqual(user_b.groups_id, (group_BB + group_B + group_C))
+        self.assertEqual(user_a.groups_id, (group_AA + group_A + group_C + group_user + group_no_one))
+        # As user_b is not an internal user, all its groups are removed
+        self.assertEqual(user_b.groups_id, group_C)