Merge lp:~matiasb/payclient/make-unattended-card-update into lp:payclient

[Matias Bordese]

Added new credit card optional make_unattended_default parameter.

Added new credit card optional make_unattended_default parameter.

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

[Ricardo Kirkner (ricardokirkner)]

Need to include necessary dependencies to get tests running, but other than that looks good

=== modified file 'setup.py'
--- setup.py 2013-03-20 12:22:07 +0000
+++ setup.py 2013-03-25 21:42:04 +0000
@@ -27,6 +27,10 @@
     package_dir={'': 'src'},
     install_requires=[
         'piston-mini-client',
+ 'python-dateutil',
+ ],
+ tests_require=[
+ 'mock',
     ],
     test_suite='payclient.tests',
 )

review: Needs Fixing

[lp:~matiasb/payclient/make-unattended-card-update]

5. By Matias Bordese on 2013-03-25

Updated deps in setup.py

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'setup.py'
--- setup.py	2013-03-20 12:22:07 +0000
+++ setup.py	2013-03-25 21:49:20 +0000
@@ -27,6 +27,10 @@
     package_dir={'': 'src'},
     install_requires=[
         'piston-mini-client',
+        'python-dateutil',
+    ],
+    tests_require=[
+        'mock',
     ],
     test_suite='payclient.tests',
 )
 
=== modified file 'src/payclient/client.py'
--- src/payclient/client.py	2013-03-20 12:22:07 +0000
+++ src/payclient/client.py	2013-03-25 21:49:20 +0000
@@ -39,8 +39,10 @@
         'card_ccv',
         'card_expiration_month',
         'card_expiration_year',
+        'make_unattended_default',
         'billing_address',
     )
+    make_unattended_default = False
 
 
 class PaymentRequest(PistonSerializable):
 
=== modified file 'src/payclient/tests/test_client.py'
--- src/payclient/tests/test_client.py	2013-03-20 12:22:07 +0000
+++ src/payclient/tests/test_client.py	2013-03-25 21:49:20 +0000
@@ -46,9 +46,14 @@
             'card_ccv',
             'card_expiration_month',
             'card_expiration_year',
+            'make_unattended_default',
             'billing_address',
         ))
 
+    def test_default_attributes(self):
+        request = CreditCardRequest()
+        self.assertEqual(request.make_unattended_default, False)
+
 
 class PaymentRequestTestCase(TestCase):
     def test_request_attributes(self):
@@ -409,14 +414,15 @@
             'new_credit_card', data=request, api_method='_post')
 
     def test_new_card_validate(self):
-        try:
+        with self.assertRaises(ValidationException) as exc:
             self.auth_api.new_credit_card(data='foo')
-        except ValidationException, e:
-            self.assertEqual(
-                str(e), "Argument 'data' must be a <class "
-                        "'payclient.client.CreditCardRequest'>")
-        else:
-            self.fail('ValidationException not raised')
+
+        # check for startswith to be compatible with
+        # different piston_mini_client versions
+        self.assertTrue(
+            exc.exception.message.startswith(
+                "Argument 'data' must be a <class "
+                "'payclient.client.CreditCardRequest'>"))
 
     def test_new_card_return_value(self):
         self.auth_api._post.return_value = self.mock_card_response_body
@@ -451,14 +457,15 @@
         self.assert_protected('new_payment', data=request, api_method='_post')
 
     def test_new_payment_validate(self):
-        try:
+        with self.assertRaises(ValidationException) as exc:
             self.auth_api.new_payment(data='foo')
-        except ValidationException, e:
-            self.assertEqual(
-                str(e), "Argument 'data' must be a <class "
-                        "'payclient.client.PaymentRequest'>")
-        else:
-            self.fail('ValidationException not raised')
+
+        # check for startswith to be compatible with 
+        # different piston_mini_client versions
+        self.assertTrue(
+            exc.exception.message.startswith(
+                "Argument 'data' must be a <class "
+                "'payclient.client.PaymentRequest'>"))
 
     def test_new_payment_return_value(self):
         self.auth_api._post.return_value = self.mock_payment_response_body
 
=== added file 'tarmac_tests.sh'
--- tarmac_tests.sh	1970-01-01 00:00:00 +0000
+++ tarmac_tests.sh	2013-03-25 21:49:20 +0000
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+set -e
+
+python -m unittest discover src