Changeset 9436 for main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch

Timestamp:

26 Oct 2012, 21:49:15 (12 years ago)

Author:

Henrik Bettermann

Message:

Log payment category.

Adjust to previous revisions.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch

Files:

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

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

@@ -120 +120 @@
     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.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

@@ -79 +79 @@
         self.browser.open(self.payments_path + '/addop')
         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>37100.0</span>...',
+            self.browser.contents)
+        self.payment_url = self.browser.url
 
 
@@ -93 +104 @@
 
     def test_interswitch_form(self):
-
-        # In the setup method we created the ticket
-        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>37100.0</span>...',
-            self.browser.contents)
-        self.payment_url = self.browser.url
-
         # Manager can access InterswitchForm
         self.browser.getLink("CollegePAY", index=0).click()