Added test coverage, fix bugs with xapi and basic auth

Author: Ishrock

Adyen/client.py

@@ -222,11 +222,13 @@ def call_api(self, request_data, service, action, idempotency=False,
 
         # username at self object has highest priority. fallback to root module
         # and ensure that it is set.
+        xapikey = None
         if self.xapikey:
             xapikey = self.xapikey
         elif 'xapikey' in kwargs:
             xapikey = kwargs.pop("xapikey")
 
+        username = None
         if self.username:
             username = self.username
         elif 'username' in kwargs:
@@ -237,15 +239,18 @@ def call_api(self, request_data, service, action, idempotency=False,
                 username = self._store_payout_username(**kwargs)
             else:
                 username = self._review_payout_username(**kwargs)
-        if not username:
+
+        if not username and not xapikey:
             errorstring = """Please set your webservice username.
               You can do this by running
               'Adyen.username = 'Your username'"""
             raise AdyenInvalidRequestError(errorstring)
             # password at self object has highest priority.
             # fallback to root module
             # and ensure that it is set.
-        if self.password:
+
+        password = None
+        if self.password and not xapikey:
             password = self.password
         elif 'password' in kwargs:
             password = kwargs.pop("password")
@@ -255,7 +260,8 @@ def call_api(self, request_data, service, action, idempotency=False,
                 password = self._store_payout_pass(**kwargs)
             else:
                 password = self._review_payout_pass(**kwargs)
-        if not password:
+
+        if not password and not xapikey:
             errorstring = """Please set your webservice password.
               You can do this by running
               'Adyen.password = 'Your password'"""

test/BaseTest.py

@@ -1,4 +1,8 @@
-import mock
+
+try:
+    import mock
+except Exception:
+    from unittest import mock
 import json
 from Adyen import httpclient
 

test/PaymentTest.py

@@ -4,14 +4,6 @@
 
 
 class TestPayments(unittest.TestCase):
-    adyen = Adyen.Adyen()
-
-    client = adyen.client
-    test = BaseTest(adyen)
-    client.username = "YourWSUser"
-    client.password = "YourWSPassword"
-    client.platform = "test"
-    client.app_name = "appname"
 
     def test_authorise_success_mocked(self):
         request = {}
@@ -197,14 +189,40 @@ def test_error_401_mocked(self):
                                 self.adyen.payment.authorise, request)
 
 
-TestPayments.client.http_force = "requests"
-suite = unittest.TestLoader().loadTestsFromTestCase(TestPayments)
-unittest.TextTestRunner(verbosity=2).run(suite)
-TestPayments.client.http_force = "pycurl"
-TestPayments.client.http_init = False
-suite = unittest.TestLoader().loadTestsFromTestCase(TestPayments)
-unittest.TextTestRunner(verbosity=2).run(suite)
-TestPayments.client.http_force = "other"
-TestPayments.client.http_init = False
-suite = unittest.TestLoader().loadTestsFromTestCase(TestPayments)
-unittest.TextTestRunner(verbosity=2).run(suite)
+class BasicAuth(TestPayments):
+    adyen = Adyen.Adyen()
+
+    client = adyen.client
+    test = BaseTest(adyen)
+    client.username = "YourWSUser"
+    client.password = "YourWSPassword"
+    client.platform = "test"
+    client.app_name = "appname"
+
+
+class XApiKey(TestPayments):
+    adyen = Adyen.Adyen()
+
+    client = adyen.client
+    test = BaseTest(adyen)
+    client.platform = "test"
+    client.app_name = "appname"
+    client.xapikey = "YourWSXApiKey"
+
+
+def test_with(auth):
+    auth.client.http_force = "requests"
+    suite = unittest.TestLoader().loadTestsFromTestCase(auth)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+    auth.client.http_force = "pycurl"
+    auth.client.http_init = False
+    suite = unittest.TestLoader().loadTestsFromTestCase(auth)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+    auth.client.http_force = "other"
+    auth.client.http_init = False
+    suite = unittest.TestLoader().loadTestsFromTestCase(auth)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+
+
+test_with(BasicAuth)
+test_with(XApiKey)