Changeset 15827

Timestamp:

19 Nov 2019, 13:08:27 (5 years ago)

Author:

Henrik Bettermann

Message:

Fix module_activated.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• remita/browser.py (modified) (4 diffs)
• students/tests/test_browser.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/remita/browser.py

@@ -107 +107 @@
 
     def update(self):
-        if not module_activated(self.context.student.current_session):
+        if not module_activated(
+            self.context.student.current_session, self.context):
             return
         self.orderId = self.context.p_id
@@ -116 +117 @@
             self.redirect(self.url(self.context, '@@index'))
             return
+        self.context.r_company = u'remita'
         return
 
@@ -171 +173 @@
 
     def update(self):
-        if not module_activated(self.context.__parent__.__parent__.year):
+        if not module_activated(
+            self.context.__parent__.__parent__.year, self.context):
             return
         self.orderId = self.context.p_id
@@ -180 +183 @@
             self.redirect(self.url(self.context, '@@index'))
             return
+        self.context.r_company = u'remita'
         return

main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_browser.py

@@ -108 +108 @@
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
-        # Managers can open payment slip
-        self.browser.getLink("Download payment slip").click()
-        self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
+        # Managers can open payment slip because we did not proceed to
+        # any payment gateway
+        self.assertFalse('Download payment slip' in self.browser.contents)
         # Set ticket paid
         ticket = self.student['payments'].items()[0][1]