Index: /main/waeup.kwarapoly/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kwarapoly/trunk/CHANGES.txt	(revision 11576)
+++ /main/waeup.kwarapoly/trunk/CHANGES.txt	(revision 11577)
@@ -4,4 +4,7 @@
 1.2dev (unreleased)
 ===================
+
+* Webservice test extended to ensure that special payment applicants
+  can pay twice.
 
 * File input fields brought into shape with Bootstrap 3.
Index: /main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py
===================================================================
--- /main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py	(revision 11576)
+++ /main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py	(revision 11577)
@@ -36,5 +36,5 @@
 #   If you enable this, please make sure the external services
 #   do exist really and are not bothered by being spammed by a test programme.
-EXTERNAL_TESTS = True
+EXTERNAL_TESTS = False
 
 def external_test(func):
@@ -612,6 +612,9 @@
     @external_test
     def test_webservice(self):
-
-        self.browser.open(self.payment_url + '/request_webservice')
+        self.prepare_special_container()
+        self.browser.open(self.special_manage_path)
+        self.browser.getControl("Add online").click()
+        payment_url = self.browser.url
+        self.browser.open(payment_url + '/request_webservice')
         self.assertMatches('...Unsuccessful callback...',
                           self.browser.contents)
@@ -624,13 +627,13 @@
         # Interswitch doesn't provide any interface
         # for testing.
-        p_id = self.applicant.keys()[0]
-        payment = self.applicant[p_id]
+        p_id = self.special_applicant.keys()[0]
+        payment = self.special_applicant[p_id]
         payment.p_id = 'p3543612043224'
-        self.browser.open(self.payment_url + '/request_webservice')
+        self.browser.open(payment_url + '/request_webservice')
         self.assertMatches('...Callback amount does not match...',
                           self.browser.contents)
         payment.amount_auth = payment.r_amount_approved
 
-        self.browser.open(self.payment_url + '/request_webservice')
+        self.browser.open(payment_url + '/request_webservice')
         self.assertMatches('...Successful payment...',
                           self.browser.contents)
@@ -650,5 +653,5 @@
         self.assertTrue(
             'zope.mgr - waeup.kwarapoly.interswitch.browser.InterswitchPaymentRequestWebservicePageApplicant'
-            ' - nd_anything - successful payment: p3543612043224\n'
+            ' - special_anything - successful payment: p3543612043224\n'
             in logcontent)
         # ... and in payments.log
@@ -657,5 +660,9 @@
         logcontent = open(logfile).read()
         self.assertTrue(
-            '"zope.mgr",nd_anything,p3543612043224,application,52100.0,'
+            '"zope.mgr",special_anything,p3543612043224,transcript_local,52100.0,'
             '00,0.0,0.0,0.0,,,\n'
             in logcontent)
+        self.assertEqual(self.applicant.state, 'started')
+        # Special Payment applicant can add new payment
+        self.browser.open(self.edit_path)
+        self.assertTrue('Add online payment ticket' in self.browser.contents)
