Changeset 17290 for main/kofacustom.dspg

Timestamp:

16 Jan 2023, 20:39:07 (22 months ago)

Author:

Henrik Bettermann

Message:

Adjust to base package.

Location:

main/kofacustom.dspg/trunk

Files:

• etc/site.zcml.in (modified) (2 diffs)
• src/kofacustom/dspg/ftesting.zcml (modified) (2 diffs)
• src/kofacustom/dspg/students/tests/test_export.py (modified) (1 diff)

main/kofacustom.dspg/trunk/etc/site.zcml.in

@@ -1 +1 @@
 <configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:browser="http://namespaces.zope.org/browser"
            xmlns:kofa="http://namespaces.waeup.org/kofa"
            i18n_domain="kofacustom.dspg">
@@ -66 +67 @@
              principal="zope.manager" />
    </configure>
+
+   <!-- session -->
+   <browser:beakerSession
+        key="waeup.kofa.session.id"
+        secret="KofaRocks"
+        timeout="3600"
+        type="cookie"
+        validate_key="thisMightBeChanged"
+        />
+        
 </configure>

main/kofacustom.dspg/trunk/src/kofacustom/dspg/ftesting.zcml

@@ -1 +1 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
+   xmlns:browser="http://namespaces.zope.org/browser"
    xmlns:kofa="http://namespaces.waeup.org/kofa"
    i18n_domain="kofacustom.dspg"
@@ -65 +66 @@
   <grant role="zope.Manager" principal="zope.mgr" />
 
+   <!-- session -->
+   <browser:beakerSession
+        key="waeup.kofa.session.id"
+        secret="KofaRocks"
+        timeout="3600"
+        type="cookie"
+        validate_key="thisMightBeChanged"
+        />
+        
 </configure>

main/kofacustom.dspg/trunk/src/kofacustom/dspg/students/tests/test_export.py

@@ -103 +103 @@
         result = open(self.outfile, 'rb').read()
         self.assertMatches(
-            'ac,amount_auth,creation_date,gateway_amt,net_amt,p_category,p_combi,p_current,'
+            'ac,amount_auth,creation_date,gateway_amt,net_amt,p_category,p_combi,p_currency,p_current,'
             'p_id,p_item,p_level,p_option,p_session,p_state,payment_date,provider_amt,'
             'r_amount_approved,r_card_num,r_code,r_company,r_desc,'
-            'r_pay_reference,thirdparty_amt,student_id,state,'
+            'r_pay_reference,r_payment_link,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],1,my-id,p-item,'
+            '666,12.12,%s-04-01 13:12:01#,,,schoolfee,[],,1,my-id,p-item,'
             '100,,%s,paid,%s-04-01 14:12:01#,,12.12,'
-            '789,r-code,interswatch,,,,A111111,created,2012\r\n'
+            '789,r-code,interswatch,,,,,A111111,created,2012\r\n'
             % (curr_year-6, curr_year-6, curr_year-6), result
             )