Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/tests

Timestamp:

21 Sep 2012, 08:19:35 (13 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/browser/tests/test_browser.py (modified) (7 diffs)
• src/waeup/kofa/browser/tests/test_permissions.py (modified) (1 diff)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/tests/test_browser.py

@@ -21 +21 @@
 import shutil
 import tempfile
+import pytz
+from datetime import datetime, timedelta
+from StringIO import StringIO
 import os
+import grok
 from zc.async.testing import wait_for_result
-from zope.component import createObject, getUtility
+from zope.event import notify
+from zope.component import createObject, queryUtility, getUtility
 from zope.component.hooks import setSite, clearSite
+from zope.catalog.interfaces import ICatalog
 from zope.security.interfaces import Unauthorized
+from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.testbrowser.testing import Browser
+from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
 from waeup.kofa.app import University
@@ -33 +41 @@
 from waeup.kofa.university.faculty import Faculty
 from waeup.kofa.university.department import Department
+
+
+
 
 SAMPLE_FILE = os.path.join(os.path.dirname(__file__), 'test_file.csv')
@@ -79 +90 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
             self.course, level=100)
 
@@ -116 +127 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.datacenter_path)
-        self.browser.getLink("Upload data").click()
+        self.browser.getLink("Upload CSV file").click()
         file = open(SAMPLE_FILE)
         ctrl = self.browser.getControl(name='uploadfile:file')
@@ -170 +181 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.datacenter_path)
-        self.browser.getLink("Export data").click()
+        self.browser.getLink("Export CSV file").click()
         self.browser.getControl(name="exporter").value = ['faculties']
         self.browser.getControl("Create CSV file").click()
@@ -193 +204 @@
         # ...we can download the result
         self.browser.getControl("Download").click()
-        self.assertEqual(self.browser.headers['content-type'],
+        self.assertEqual(self.browser.headers['Content-Type'],
                          'text/csv; charset=UTF-8')
-        self.assertEqual(self.browser.headers['content-disposition'],
-                         'attachment; filename="WAeUP.Kofa_faculties.csv')
         self.assertEqual(self.browser.contents,
-            'code,title,title_prefix,users_with_local_roles\r\n'
-            'fac1,Unnamed Faculty,faculty,[]\r\n')
+            'code,title,title_prefix\r\nfac1,Unnamed Faculty,faculty\r\n')
 
         # after download, the job and the result file are removed
@@ -221 +229 @@
         self.assertTrue('Discarded export result' in self.browser.contents)
         return
-
-    def test_skeleton_download(self):
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open(self.datacenter_path)
-        self.browser.getLink("Upload data").click()
-        self.assertTrue(
-            '<a href="skeleton?name=facultyprocessor">Download</a>'
-            in self.browser.contents)
-        self.browser.getLink(url='skeleton?name=facultyprocessor').click()
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertEqual(self.browser.headers['Content-Type'],
-                         'text/csv; charset=UTF-8')
-        self.assertEqual(self.browser.contents,
-            'code,local_roles,title,title_prefix\r\n')
-        return

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/browser/tests/test_permissions.py

@@ -91 +91 @@
         cert.code = 'cert1'
         dept.certificates.addCertificate(cert)
-        cert.addCertCourse(course)
+        cert.addCourseRef(course)
 
         self.browser = Browser()