Changeset 12353

Timestamp:

31 Dec 2014, 16:09:01 (10 years ago)

Author:

Henrik Bettermann

Message:

Change button text.

Extend test.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (9 diffs)

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

@@ -429 +429 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    @action(_('Apply now'), style='primary')
+    @action(_('Apply'), style='primary')
     def apply(self, **data):
         form = self.request.form
@@ -993 +993 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    @action(_('Apply now'), style='primary')
+    @action(_('Apply'), style='primary')
     def apply(self, **data):
         form = self.request.form
@@ -1394 +1394 @@
             dict(name=x, title=y) for x, y in allowed_transitions]
 
-    @action(_('Apply now'), style='primary')
+    @action(_('Apply'), style='primary')
     def apply(self, **data):
         form = self.request.form

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

@@ -325 +325 @@
         # Managers can trigger transitions
         self.browser.getControl(name="transition").value = ['start']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         # Managers can edit base
         self.browser.open(self.customer_path)
@@ -388 +388 @@
         self.browser.open(self.trigtrans_path)
         self.browser.getControl(name="transition").value = ['start']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)
         self.browser.getControl(name="transition").value = ['request']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)
         self.browser.getControl(name="transition").value = ['reject']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)
         self.browser.getControl(name="transition").value = ['request']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)
         self.browser.getControl(name="transition").value = ['approve']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.open(self.trigtrans_path)
         self.browser.getControl(name="transition").value = ['reset1']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         return
 
@@ -837 +837 @@
         # Managers can access the pages of customer documentsconter
         # and can perform actions
-        IWorkflowState(self.customer).setState('approved')
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
         self.browser.open(self.customer_path)
@@ -865 +864 @@
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['submit']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.getLink("Transition").click()
+        # Document can only be verified if customer is approved
+        self.browser.getControl(name="transition").value = ['verify']
+        self.browser.getControl("Apply").click()
+        self.assertTrue('Customer has not yet been approved' in self.browser.contents)
+        IWorkflowState(self.customer).setState(APPROVED)
         # Document can only be verified if files have been uploaded before
+        self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['verify']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.assertTrue('No file uploaded' in self.browser.contents)
         self.assertEqual(document.state, 'submitted')
@@ -1057 +1062 @@
         self.browser.open(self.documents_path + '/DOC1/trigtrans')
         self.browser.getControl(name="transition").value = ['verify']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.assertEqual(
             getattr(self.document, 'sample_md5', None),
@@ -1191 +1196 @@
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['submit']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.browser.getLink("Transition").click()
         self.browser.getControl(name="transition").value = ['approve']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.assertEqual(contract.state, 'approved')
 
@@ -1318 +1323 @@
         # Customer can submit the form. The form is also saved.
         self.browser.getLink("Edit").click()
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.assertEqual(contract.state, 'submitted')
         self.assertTrue('Contract State: submitted for approval' in self.browser.contents)
@@ -1375 +1380 @@
         self.browser.open(self.contracts_path + '/CON1/trigtrans')
         self.browser.getControl(name="transition").value = ['approve']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         # InvalidTransitionError is catched
         self.assertTrue(
@@ -1383 +1388 @@
         IWorkflowState(self.document).setState('verified')
         self.browser.getControl(name="transition").value = ['approve']
-        self.browser.getControl("Apply now").click()
+        self.browser.getControl("Apply").click()
         self.assertEqual(IWorkflowState(self.contract).getState(), 'approved')