Changeset 11729

Timestamp:

3 Jul 2014, 09:04:34 (10 years ago)

Author:

Henrik Bettermann

Message:

Application payment slips can only be downloaded if application form is submitted.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/browser.py (modified) (1 diff)
• src/waeup/kofa/applicants/tests/test_browser.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -5 +5 @@
 ===================
 
-* Option for additional passport upload requirements added.
+* Application payment slips can only be downloaded if application form is
+  submitted.
+
+* Method for additional passport upload requirements added.
 
 * Remove unused rowadd javascript function.

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -739 +739 @@
 
     def render(self):
-        if self.context.__parent__.special \
-            and self.context.__parent__.state != SUBMITTED:
+        if self.context.__parent__.state != SUBMITTED:
             self.flash(_('Please submit the application form before '
                          'trying to download payment slips.'), type='warning')

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

@@ -847 +847 @@
         # We approve the payment by bypassing the view
         payment.approve()
-        # The payment slip can be downloaded now
-        self.browser.open(payment_url)
-        self.browser.getLink("Download payment slip").click()
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertEqual(self.browser.headers['Content-Type'],
-                         'application/pdf')
         # Applicant is is not yet in state 'paid' because it was only
         # the payment which we set to paid
@@ -890 +884 @@
             % (self.applicant.applicant_id, payment.p_id)
             in logcontent)
+        # Payment slips can't be downloaded ...
+        payment_id = self.applicant.keys()[0]
+        self.browser.open(self.view_path + '/' + payment_id)
+        self.browser.getLink("Download payment slip").click()
+        self.assertTrue(
+            'Please submit the application form before trying to download payment slips.'
+            in self.browser.contents)
+        # ... unless form is submitted.
+        self.browser.open(self.view_path + '/edit')
+        image = open(SAMPLE_IMAGE, 'rb')
+        ctrl = self.browser.getControl(name='form.passport')
+        file_ctrl = ctrl.mech_control
+        file_ctrl.add_file(image, filename='myphoto.jpg')
+        self.browser.getControl(name="confirm_passport").value = True
+        self.browser.getControl("Final Submit").click()
+        self.browser.open(self.view_path + '/' + payment_id)
+        self.browser.getLink("Download payment slip").click()
+        self.assertEqual(self.browser.headers['Content-Type'],
+                 'application/pdf')
         return