Changeset 12169 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

8 Dec 2014, 07:14:15 (10 years ago)

Author:

Henrik Bettermann

Message:

Define is_verifiable as probably requested. Adjust test.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• browser.py (modified) (1 diff)
• documents.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -932 +932 @@
             transition_id = form['transition']
             wf_info = IWorkflowInfo(self.context)
-            wf_info.fireTransition(transition_id)
+            try:
+                wf_info.fireTransition(transition_id)
+            except InvalidTransitionError, error:
+                self.flash(error, type="warning")
         return
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/documents.py

@@ -143 +143 @@
     @property
     def is_verifiable(self):
+        files = self.connected_files
+        if files is not None and len(files) != len(self.filenames):
+            return False, _("No file uploaded.")
         return True, None
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -849 +849 @@
         self.browser.getControl(name="transition").value = ['submit']
         self.browser.getControl("Save").click()
+        # Document can only be verified if files have been uploaded before
         self.browser.getControl(name="transition").value = ['verify']
         self.browser.getControl("Save").click()
-        self.assertEqual(document.state, 'verified')
+        self.assertTrue('No file uploaded' in self.browser.contents)
+        self.assertEqual(document.state, 'submitted')
+        # We set state here manually (verification is tested in test_verify_document)
+        IWorkflowState(document).setState(VERIFIED)
 
         # Manage button and form is no longer available