Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .github/workflows/unittest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Python package

on:
pull_request:

jobs:
build:

runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.6','3.7', '3.8']

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install tox
sudo apt install libcurl4-openssl-dev
- name: Test with tox
run: tox
16 changes: 0 additions & 16 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ For more information, refer to our [documentation](https://docs.adyen.com/) or t

- [Adyen test account](https://docs.adyen.com/get-started-with-adyen)
- [API key](https://docs.adyen.com/development-resources/api-credentials#generate-api-key). For testing, your API credential needs to have the [API PCI Payments role](https://docs.adyen.com/development-resources/api-credentials#roles).
- Python 2.7 or 3.6
- Python 2.7 **(Deprecated)** or 3.6
- Packages: requests or pycurl ( optional )


Expand Down
2 changes: 1 addition & 1 deletion test/CheckoutTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def test_payments_error_mocked(self):
'returnUrl': 'https://your-company.com/...',
u'applicationInfo': {
u'adyenLibrary': {
u'version': '6.0.0',
u'version': '7.1.0',
u'name': 'adyen-python-api-library'
}
},
Expand Down
12 changes: 6 additions & 6 deletions test/DetermineEndpointTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ def test_checkout_api_url_custom(self):
url = self.adyen.client._determine_checkout_url("live", "payments")
self.client.live_endpoint_prefix = "1797a841fbb37ca7-AdyenDemo"
self.assertEqual(url, "https://1797a841fbb37ca7-AdyenDemo-checkout-"
"live.adyenpayments.com/checkout/v68/payments")
"live.adyenpayments.com/checkout/v69/payments")

def test_checkout_api_url(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"paymentsDetails")
self.assertEqual(url, "https://checkout-test.adyen.com"
"/v68/payments/details")
"/v69/payments/details")

def test_payments_invalid_platform(self):

Expand Down Expand Up @@ -112,26 +112,26 @@ def test_checkout_api_url_orders(self):
url = self.adyen.client._determine_checkout_url("test",
"orders")
self.assertEqual(url, "https://checkout-test.adyen.com"
"/v68/orders")
"/v69/orders")

def test_checkout_api_url_order_cancel(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"ordersCancel")
self.assertEqual(url, "https://checkout-test.adyen.com"
"/v68/orders/cancel")
"/v69/orders/cancel")

def test_checkout_api_url_order_payment_methods_balance(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"paymentMethods"
"Balance")
self.assertEqual(url, "https://checkout-test.adyen.com""/v68/"
self.assertEqual(url, "https://checkout-test.adyen.com""/v69/"
"paymentMethods/balance")

def test_checkout_api_url_sessions(self):
self.client.live_endpoint_prefix = None
url = self.adyen.client._determine_checkout_url("test",
"sessions")
self.assertEqual(url, "https://checkout-test.adyen.com""/v68/"
self.assertEqual(url, "https://checkout-test.adyen.com""/v69/"
"sessions")
27 changes: 1 addition & 26 deletions test/PaymentTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,29 +392,4 @@ def test_error_401_mocked(self):
" Please verify the credentials set with the"
" Adyen base class. Please reach out to your"
" Adyen Admin if the problem persists",
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)

TestPaymentsWithXapiKey.client.http_force = "requests"
suite = unittest.TestLoader().loadTestsFromTestCase(TestPaymentsWithXapiKey)
unittest.TextTestRunner(verbosity=2).run(suite)
TestPaymentsWithXapiKey.client.http_force = "pycurl"
TestPaymentsWithXapiKey.client.http_init = False
suite = unittest.TestLoader().loadTestsFromTestCase(TestPaymentsWithXapiKey)
unittest.TextTestRunner(verbosity=2).run(suite)
TestPaymentsWithXapiKey.client.http_force = "other"
TestPaymentsWithXapiKey.client.http_init = False
suite = unittest.TestLoader().loadTestsFromTestCase(TestPaymentsWithXapiKey)
unittest.TextTestRunner(verbosity=2).run(suite)
self.adyen.payment.authorise, request)
13 changes: 13 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[tox]
envlist = py{36,37,38}-{pycurl,requests,urlib}
skip_missing_interpreters=true

[testenv]
allowlist_externals = make
setenv = PYTHONHASHSEED = 34237731
deps =
mock
requests: requests
pycurl: pycurl
commands =
make tests