slapos_cloud: fix user security group test

master/bt5/slapos_cloud/TestTemplateItem/portal_components/test.erp5.testSlapOSCloudSecurityGroup.py

@@ -242,7 +242,7 @@ class TestSlapOSPersonSecurity(TestSlapOSSecurityMixin):
     self.login(person.getUserId())
     user = getSecurityManager().getUser()
     self.assertTrue('Authenticated' in user.getRoles())
-    self.assertSameSet(['G-COMPANY'], user.getGroups())
+    self.assertSameSet([], user.getGroups())
 
     # add to role category
     self.login()
@@ -253,14 +253,23 @@ class TestSlapOSPersonSecurity(TestSlapOSSecurityMixin):
     self.login(person.getUserId())
     user = getSecurityManager().getUser()
     self.assertTrue('Authenticated' in user.getRoles())
-    self.assertSameSet(['R-MEMBER', 'G-COMPANY'], user.getGroups())
+    self.assertSameSet([], user.getGroups())
+
+    # add to function category
+    self.login()
+    person.newContent(portal_type='Assignment', function='accounting/manager').open()
+    self.tic()
+
+    self.portal.portal_caches.clearAllCache()
+    self.login(person.getUserId())
+    user = getSecurityManager().getUser()
+    self.assertTrue('Authenticated' in user.getRoles())
+    self.assertSameSet(['F-ACCMAN', 'F-ACCOUNTING*', 'F-ACCMAN*'],
+                       user.getGroups())
 
-    # add to role for project
+    # add project
     self.login()
-    project = self.portal.project_module.newContent(
-      portal_type="Project"
-    )
-    project.validate()
+    project = self.addProject()
     person.newContent(portal_type='Assignment',
       destination_project_value=project).open()
     self.tic()
@@ -269,31 +278,32 @@ class TestSlapOSPersonSecurity(TestSlapOSSecurityMixin):
     self.login(person.getUserId())
     user = getSecurityManager().getUser()
     self.assertTrue('Authenticated' in user.getRoles())
-    self.assertSameSet(['R-MEMBER', 'G-COMPANY', project.getReference()], user.getGroups())
+    self.assertSameSet(['F-ACCMAN', 'F-ACCOUNTING*', 'F-ACCMAN*',
+                        project.getReference()], user.getGroups())
 
-    # add to role for project
+    # add project and function
     self.login()
-    organisation = self.portal.organisation_module.newContent(
-      portal_type="Organisation",
-      reference="OTEST-%s" % person.getUserId()
-    )
-    organisation.validate()
+    project2 = self.addProject()
     person.newContent(portal_type='Assignment',
-      destination_value=organisation).open()
+      destination_project_value=project2, function='production/manager').open()
     self.tic()
 
     self.portal.portal_caches.clearAllCache()
     self.login(person.getUserId())
     user = getSecurityManager().getUser()
     self.assertTrue('Authenticated' in user.getRoles())
-    self.assertSameSet(['R-MEMBER', 'G-COMPANY', organisation.getReference(),
-      project.getReference()], user.getGroups())
+    self.assertSameSet(['F-ACCMAN', 'F-ACCOUNTING*', 'F-ACCMAN*',
+                        project.getReference(),
+                        'F-PRODMAN', 'F-PRODUCTION*', 'F-PRODMAN*',
+                        project2.getReference(),
+                        '%s_F-PRODMAN' % project2.getReference()], user.getGroups())
+
 
 
   def test_inactive(self, login_portal_type="Certificate Login"):
     reference = self._generateRandomUniqueReference('Person')
     user_id = self._generateRandomUniqueReference('Person')
-    
+
     person = self.portal.person_module.newContent(portal_type='Person',
       reference=reference)
     password = person.Person_generatePassword()