Merge lp:~matiasb/payclient/update-credit-card-3d into lp:payclient

[Matias Bordese]

Updated new credit card API request/response.

[Natalia Bidart (nataliabidart)]

Looks good, added a question inline.

review: Approve

[Matias Bordese (matiasb)]

Replied question.

[lp:~matiasb/payclient/update-credit-card-3d]

14. By Matias Bordese on 2014-08-25

Updated responses.

15. By Matias Bordese on 2014-08-25

Update from review.

[Natalia Bidart (nataliabidart)]

Looks good.

review: Approve

=== modified file 'src/payclient/client.py'
--- src/payclient/client.py	2014-08-08 21:04:36 +0000
+++ src/payclient/client.py	2014-08-25 18:45:35 +0000
@@ -39,9 +39,11 @@
         'card_ccv',
         'card_expiration_month',
         'card_expiration_year',
+        'info3d',
         'make_unattended_default',
         'billing_address',
     )
+    info3d = None
     make_unattended_default = False
 
     @classmethod
@@ -134,8 +136,9 @@
     @classmethod
     def from_dict(cls, data):
         obj = super(CreditCardResponse, cls).from_dict(data)
-        # cast date/datetime fields
-        if obj.expiration:
+        status = data.get('status')
+        if status == 'COMPLETED' and obj.expiration:
+            # cast expiration date as date object
             obj.expiration = parser.parse(obj.expiration)
         return obj
 

=== modified file 'src/payclient/tests/test_client.py'
--- src/payclient/tests/test_client.py	2014-08-08 21:04:36 +0000
+++ src/payclient/tests/test_client.py	2014-08-25 18:45:35 +0000
@@ -49,6 +49,7 @@
             'card_ccv',
             'card_expiration_month',
             'card_expiration_year',
+            'info3d',
             'make_unattended_default',
             'billing_address',
         ))
@@ -185,18 +186,31 @@
 
 class CreditCardResponseTestCase(TestCase):
     def setUp(self):
-        self.data = {
+        self.data_ok = {
+            'status': 'COMPLETED',
             'masked_number': '1111',
             'expiration': '2012-1-1',
             'card_type': 'Visa',
         }
+        self.data_3dsecure = {
+            'status': '3DSECURE',
+            'payment_id': '123',
+            'info3d': {'foo': 'bar'},
+        }
 
-    def test_from_dict(self):
-        response = CreditCardResponse.from_dict(self.data)
-        self.assertEqual(response.masked_number, self.data['masked_number'])
+    def test_from_dict_ok(self):
+        response = CreditCardResponse.from_dict(self.data_ok)
+        self.assertEqual(response.masked_number, self.data_ok['masked_number'])
         expiration_date = datetime(2012, 1, 1, 0, 0)
         self.assertEqual(response.expiration, expiration_date)
-        self.assertEqual(response.card_type, self.data['card_type'])
+        self.assertEqual(response.card_type, self.data_ok['card_type'])
+        self.assertEqual(response.status, self.data_ok['status'])
+
+    def test_from_dict_3dsecure(self):
+        response = CreditCardResponse.from_dict(self.data_3dsecure)
+        self.assertEqual(response.status, self.data_3dsecure['status'])
+        self.assertEqual(response.payment_id, self.data_3dsecure['payment_id'])
+        self.assertEqual(response.info3d, self.data_3dsecure['info3d'])
 
 
 class PaymentResponseTestCase(TestCase):
@@ -404,11 +418,18 @@
         self.auth_api._put = Mock()
 
         self.mock_card_response_body = json.dumps({
+            'status': 'COMPLETED',
             'masked_number': '1111',
             'expiration': '2012-01-01',
             'card_type': 'Visa',
         })
 
+        self.mock_card_3d_response_body = json.dumps({
+            'status': '3DSECURE',
+            'payment_id': '12345',
+            'info3d': {'url': 'https://3dsecure.url'},
+        })
+
         self.mock_payment_response_body = json.dumps({
             'total': '1.00',
             'total_vat': None,
@@ -579,6 +600,11 @@
         self.assert_return_value(CreditCardResponse, 'new_credit_card',
             data=CreditCardRequest())
 
+    def test_new_card_3dsecure_return_value(self):
+        self.auth_api._post.return_value = self.mock_card_3d_response_body
+        self.assert_return_value(CreditCardResponse, 'new_credit_card',
+            data=CreditCardRequest())
+
     def test_get_payment_protected(self):
         self.assert_protected('get_payment', payment_id='foo',
             api_method='_get')