Changeset 10347

Timestamp:

22 Jun 2013, 17:01:32 (12 years ago)

Author:

Henrik Bettermann

Message:

CC Officer does no longer exist in base package.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/tests/test_browser.py (modified) (2 diffs)
• permissions.txt (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py

@@ -257 +257 @@
 
     def test_export_accesscodes(self):
-        # Create portal manager and CCOfficer
-        self.app['users'].addUser('mrmanager', 'mrmanagersecret')
-        self.app['users']['mrmanager'].email = 'mrmanager@foo.ng'
-        self.app['users']['mrmanager'].title = 'Carlo Pitter'
+        # Create portal manager and an ExportManager
+        self.app['users'].addUser('mrportal', 'mrportalsecret')
+        self.app['users']['mrportal'].email = 'mrportal@foo.ng'
+        self.app['users']['mrportal'].title = 'Carlo Pitter'
         # Assign PortalManager role
         prmlocal = IPrincipalRoleManager(self.app)
-        prmlocal.assignRoleToPrincipal('waeup.PortalManager', 'mrmanager')
-        self.app['users'].addUser('mrofficer', 'mrofficersecret')
-        self.app['users']['mrofficer'].email = 'mrofficer@foo.ng'
-        self.app['users']['mrofficer'].title = 'Carlos Potter'
-        # Assign CCOfficer role
-        prmlocal.assignRoleToPrincipal('waeup.CCOfficer', 'mrofficer')
+        prmlocal.assignRoleToPrincipal('waeup.PortalManager', 'mrportal')
+        self.app['users'].addUser('mrexporter', 'mrexportersecret')
+        self.app['users']['mrexporter'].email = 'mrexporter@foo.ng'
+        self.app['users']['mrexporter'].title = 'Carlos Potter'
+        # Assign ExportManager role
+        prmlocal.assignRoleToPrincipal('waeup.ExportManager', 'mrexporter')
 
         # Login as portal manager
         self.browser.open('http://localhost/app/login')
-        self.browser.getControl(name="form.login").value = 'mrmanager'
-        self.browser.getControl(name="form.password").value = 'mrmanagersecret'
+        self.browser.getControl(name="form.login").value = 'mrportal'
+        self.browser.getControl(name="form.password").value = 'mrportalsecret'
         self.browser.getControl("Login").click()
 
@@ -299 +299 @@
         # Login as officer who is not allowed to download accesscodes
         self.browser.open('http://localhost/app/login')
-        self.browser.getControl(name="form.login").value = 'mrofficer'
-        self.browser.getControl(name="form.password").value = 'mrofficersecret'
+        self.browser.getControl(name="form.login").value = 'mrexporter'
+        self.browser.getControl(name="form.password").value = 'mrexportersecret'
         self.browser.getControl("Login").click()
 
         self.browser.open(self.datacenter_path + '/export')
-        # The CC Officer can see the accesscodebatches exporter ...
+        # The Export Manager can see the accesscodebatches exporter ...
         self.assertTrue(
             '<option value="accesscodebatches">' in self.browser.contents)

main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt

@@ -39 +39 @@
     >>> from waeup.kofa.permissions import get_waeup_roles
     >>> len(list(get_waeup_roles()))
-    23
+    22
 
     >>> len(list(get_waeup_roles(also_local=True)))
-    41
+    40
 
 
@@ -61 +61 @@
      u'waeup.ApplicationsOfficer',
      u'waeup.BursaryOfficer',
-     u'waeup.CCOfficer',
      u'waeup.DataCenterManager',
      u'waeup.ExportManager',