Changeset 9435 for main/waeup.uniben/trunk/src/waeup/uniben/interswitch

Timestamp:

26 Oct 2012, 21:48:51 (12 years ago)

Author:

Henrik Bettermann

Message:

Log payment category.

Adjust to previous revisions.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/interswitch

Files:

• browser.py (modified) (1 diff)
• tests.py (modified) (2 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/browser.py

@@ -118 +118 @@
     payment.payment_date = datetime.utcnow()
     msg = _('Successful callback received')
-    log = 'valid callback for payment %s: %s' % (payment.p_id, sr)
+    log = 'valid callback for %s payment %s: %s' % (
+        payment.p_category, payment.p_id, sr)
     return True, msg, log
 

main/waeup.uniben/trunk/src/waeup/uniben/interswitch/tests.py

@@ -54 +54 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-
+        self.assertMatches('...ticket created...',
+                           self.browser.contents)
+        ctrl = self.browser.getControl(name='val_id')
+        value = ctrl.options[0]
+        self.browser.getLink(value).click()
+        self.assertMatches('...Amount Authorized...',
+                           self.browser.contents)
+        self.assertMatches(
+            '...<span>40000.0</span>...',
+            self.browser.contents)
+        self.payment_url = self.browser.url
 
 #    def callback_url(self, payment_url, resp, apprAmt):
@@ -68 +78 @@
 
     def test_interswitch_form(self):
-
-        # School fee ticket already created in setUp method
-        self.assertMatches('...ticket created...',
-                           self.browser.contents)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[0]
-        self.browser.getLink(value).click()
-        self.assertMatches('...Amount Authorized...',
-                           self.browser.contents)
-        self.assertMatches(
-            '...<span>40000.0</span>...',
-            self.browser.contents)
-        self.payment_url = self.browser.url
         # Manager can access InterswitchForm
         self.browser.getLink("CollegePAY", index=0).click()