From 0b441d1b41dcfe0d52e93ac7100b8717a03c9fba Mon Sep 17 00:00:00 2001 From: Elnaz Moshfeghian Date: Fri, 6 Nov 2015 09:38:06 -0800 Subject: [PATCH] feat(upgrade): update all tests and examples to work with 2015-11-06 --- README.md | 1 + examples/check.py | 14 +++------- lob/resource.py | 3 +++ tests/test_bankaccount.py | 56 --------------------------------------- tests/test_check.py | 24 ++++++++--------- 5 files changed, 18 insertions(+), 80 deletions(-) diff --git a/README.md b/README.md index 618ca24..37be44a 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,7 @@ There are simple scripts to demonstrate how to create all the core Lob objects ( ## API Documentation - [Introduction](https://lob.com/docs/python#introduction) +- [Authentication](https://lob.com/docs/python#auth) - [Versioning](https://lob.com/docs/python#version) - [Errors](https://lob.com/docs/python#errors) - [Rate Limiting](https://lob.com/docs/python#rate-limits) diff --git a/examples/check.py b/examples/check.py index 0cc8e95..25cc5ab 100644 --- a/examples/check.py +++ b/examples/check.py @@ -34,16 +34,7 @@ description = 'Example bank account', routing_number = '122100024', account_number = '1234564789', - signatory = 'John Doe', - bank_address = { - 'name': 'Bank Address', - 'address_line1': '123 Wall Street', - 'address_city': 'San Francisco', - 'address_state': 'CA', - 'address_zip': '94158', - 'address_country': 'US' - }, - account_address = example_address + signatory = 'John Doe' ) print "Bank Account Response" @@ -78,7 +69,8 @@ metadata = { 'FY': '2015' }, - to_address = { + to_address = example_address, + from_address = { 'name': 'Lob', 'address_line1': '185 Berry Street', 'address_line2': 'Suite 1510', diff --git a/lob/resource.py b/lob/resource.py index d54d107..adfef7a 100644 --- a/lob/resource.py +++ b/lob/resource.py @@ -159,6 +159,9 @@ def create(cls, **params): if 'to_address' in params: params['to'] = params['to_address'] params.pop('to_address') + if 'from_address' in params: + params['from'] = params['from_address'] + params.pop('from_address') return super(Check, cls).create(**params) diff --git a/tests/test_bankaccount.py b/tests/test_bankaccount.py index fcb9abc..96e7281 100644 --- a/tests/test_bankaccount.py +++ b/tests/test_bankaccount.py @@ -28,49 +28,9 @@ def test_create_bankAccount(self): bankAccount = lob.BankAccount.create( routing_number='122100024', account_number='123456789', - bank_address=self.addr.id, - account_address=self.addr.id, signatory='John Doe' ) self.assertTrue(isinstance(bankAccount, lob.BankAccount)) - self.assertEqual(bankAccount.bank_address.id, self.addr.id) - - def test_create_bankAccount_lob_obj(self): - bankAccount = lob.BankAccount.create( - routing_number='122100024', - account_number='123456789', - bank_address=self.addr, - account_address=self.addr, - signatory='John Doe' - ) - self.assertTrue(isinstance(bankAccount, lob.BankAccount)) - self.assertEqual(bankAccount.bank_address.id, self.addr.id) - - def test_create_bankAccount_inline(self): - bankAccount = lob.BankAccount.create( - routing_number='122100024', - account_number='123456789', - bank_address= { - 'name': 'Lob1', - 'address_line1': '185 Berry Street', - 'address_line2': 'Suite 1510', - 'address_city': 'San Francisco', - 'address_zip': '94107', - 'address_state': 'CA' - }, - account_address= { - 'name': 'Lob2', - 'address_line1': '185 Berry Street', - 'address_line2': 'Suite 1510', - 'address_city': 'San Francisco', - 'address_zip': '94107', - 'address_state': 'CA' - }, - signatory='John Doe' - ) - self.assertTrue(isinstance(bankAccount, lob.BankAccount)) - self.assertEquals(bankAccount.bank_address.name, 'Lob1') - self.assertEquals(bankAccount.account_address.name, 'Lob2') def test_retrieve_bankAccount(self): bankAccount = lob.BankAccount.retrieve(id=lob.BankAccount.list().data[0].id) @@ -88,22 +48,6 @@ def test_verify_bankAccount(self): ba = lob.BankAccount.create( routing_number='122100024', account_number='223456789', - bank_address= { - 'name': 'Lob1', - 'address_line1': '185 Berry Street', - 'address_line2': 'Suite 1510', - 'address_city': 'San Francisco', - 'address_zip': '94107', - 'address_state': 'CA' - }, - account_address= { - 'name': 'Lob2', - 'address_line1': '185 Berry Street', - 'address_line2': 'Suite 1510', - 'address_city': 'San Francisco', - 'address_zip': '94107', - 'address_state': 'CA' - }, signatory='John Doe' ) verBa = lob.BankAccount.verify(id=ba.id, amounts=[25, 75]) diff --git a/tests/test_check.py b/tests/test_check.py index cd66334..6302bed 100644 --- a/tests/test_check.py +++ b/tests/test_check.py @@ -28,6 +28,7 @@ def test_create_check(self): description = 'Test Check', bank_account = self.ba.id, to_address = self.addr.id, + from_address = self.addr.id, amount = 1000, memo = 'Test Check' ) @@ -35,19 +36,7 @@ def test_create_check(self): self.assertTrue(isinstance(check, lob.Check)) self.assertEqual(check.bank_account.id, self.ba.id) self.assertEqual(check.to_address.id, self.addr.id) - - def test_create_check_lob_obj(self): - check = lob.Check.create( - description = 'Test Check', - bank_account = self.ba, - to_address = self.addr, - amount = 1000, - memo = 'Test Check' - ) - - self.assertTrue(isinstance(check, lob.Check)) - self.assertEqual(check.bank_account.id, self.ba.id) - self.assertEqual(check.to_address.id, self.addr.id) + self.assertEqual(check.from_address.id, self.addr.id) def test_create_check_inline(self): check = lob.Check.create( @@ -61,6 +50,14 @@ def test_create_check_inline(self): 'address_zip': '94107', 'address_state': 'CA' }, + from_address = { + 'name': 'Lob', + 'address_line1': '185 Berry Street', + 'address_line2': 'Suite 1510', + 'address_city': 'San Francisco', + 'address_zip': '94107', + 'address_state': 'CA' + }, amount = 1000, memo = 'Test Check' ) @@ -68,6 +65,7 @@ def test_create_check_inline(self): self.assertTrue(isinstance(check, lob.Check)) self.assertEqual(check.bank_account.id, self.ba.id) self.assertEqual(check.to_address.name, 'Lob') + self.assertEqual(check.from_address.name, 'Lob') def test_create_check_fail(self): self.assertRaises(lob.error.InvalidRequestError, lob.Check.create)