Changeset 9822 for main/waeup.kofa/trunk/src/waeup/kofa/browser/tests

Timestamp:

22 Dec 2012, 09:16:05 (12 years ago)

Author:

Henrik Bettermann

Message:

Combine ExportCSVPage and ExportJobContainerOverview? as well as ExportCSVView and ExportJobContainerDownload?. Adjust pagetemplates. Do not remove jobs after download. Display jobs of all users on ExportCSVPage.

One test still fails because we do not have a logger for VirtualExportJobContainers?.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py (modified) (4 diffs)

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

@@ -200 +200 @@
         # while the export file is created, we get a reload button
         # (or a loading bar if javascript is enabled)...
-        self.browser.getControl("Reload").click()
+        self.assertTrue('Reload' in self.browser.contents)
         # ...which is displayed as long as the job is not finished.
         # When the job is finished and we reload the page...
         job_id = self.wait_for_export_job_completed()
-        try:
-            self.browser.getControl("Reload").click()
-        except LookupError:
-            # if the job completed very fast, we will get the download
-            # link immediately
-            pass
+        self.browser.open(self.datacenter_path + '/export')
+        self.assertFalse('Reload' in self.browser.contents)
         # ...we can download the result
-        self.browser.getControl("Download").click()
+        self.browser.getLink("Download").click()
         self.assertEqual(self.browser.headers['content-type'],
                          'text/csv; charset=UTF-8')
@@ -221 +217 @@
 
         # after download, the job and the result file are removed
-        manager = getUtility(IJobManager)
-        result = manager.get(job_id)
-        self.assertEqual(result, None)
-        self.assertEqual(self.stored_in_datacenter(job_id), False)
+        #manager = getUtility(IJobManager)
+        #result = manager.get(job_id)
+        #self.assertEqual(result, None)
+        #self.assertEqual(self.stored_in_datacenter(job_id), False)
         logfile = os.path.join(
             self.app['datacenter'].storage, 'logs', 'datacenter.log')
@@ -259 +255 @@
         self.browser.getControl("Create CSV file").click()
         job_id = self.wait_for_export_job_completed()
-        try:
-            self.browser.getControl("Reload").click()
-        except LookupError:
-            pass
-        self.browser.getControl("Download").click()
+        self.browser.open(self.datacenter_path + '/@@export')
+        self.browser.getLink("Download").click()
         self.assertEqual(self.browser.headers['content-type'],
                          'text/csv; charset=UTF-8')
@@ -291 +284 @@
         self.browser.open(self.datacenter_path + '/@@export')
         self.browser.getControl("Discard").click()
-        self.assertTrue('Discarded export result' in self.browser.contents)
+        self.assertTrue('Discarded export' in self.browser.contents)
         return