8000 Parameters are now automatically transformed · meego/twilio-python@02c60e7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 02c60e7

Browse files
kyleconroykyleconroy
committed
Parameters are now automatically transformed
1 parent 9283b7e commit 02c60e7

File tree

6 files changed

+81
-75
lines changed

6 files changed

+81
-75
lines changed

‎tests/test_applications.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,24 @@ def setUp(self):
1818
def test_create_appliation_sms_url_method(self):
1919
self.resource.create_instance = Mock()
2020
self.resource.create(sms_method="hey")
21-
self.resource.create_instance.assert_called_with({"SmsMethod": "hey"})
21+
self.resource.create_instance.assert_called_with({"sms_method": "hey"})
2222

2323
def test_create_appliation_sms_url(self):
2424
self.resource.create_instance = Mock()
2525
self.resource.create(sms_url="hey")
26-
self.resource.create_instance.assert_called_with({"SmsUrl": "hey"})
26+
self.resource.create_instance.assert_called_with({"sms_url": "hey"})
2727

2828
def test_update_appliation_sms_url_method(self):
2929
self.resource.update_instance = Mock()
3030
self.resource.update("123", sms_method="hey")
3131
self.resource.update_instance.assert_called_with(
32-
"123", {"SmsMethod": "hey"})
32+
"123", {"sms_method": "hey"})
3333

3434
def test_update_appliation_sms_url(self):
3535
self.resource.update_instance = Mock()
3636
self.resource.update("123", sms_url="hey")
3737
self.resource.update_instance.assert_called_with(
38-
"123", {"SmsUrl": "hey"})
38+
"123", {"sms_url": "hey"})
3939

4040
def test_update(self):
4141
request = Mock()

‎tests/test_conferences.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,44 @@
77
from mock import patch, Mock
88
from twilio.rest.resources import Conferences
99

10+
DEFAULT = {
11+
'DateUpdated<': None,
12+
'DateUpdated>': None,
13+
'DateUpdated': None,
14+
'DateCreated<': None,
15+
'DateCreated>': None,
16+
'DateCreated': None,
17+
}
18+
1019

1120
class ConferenceTest(unittest.TestCase):
1221

1322
def setUp(self):
1423
self.resource = Conferences("foo", ("sid", "token"))
24+
self.params = DEFAULT.copy()
1525

1626
def test_list(self):
1727
self.resource.get_instances = Mock()
1828
self.resource.list()
19-
self.resource.get_instances.assert_called_with(params={})
29+
self.resource.get_instances.assert_called_with(self.params)
2030

2131
def test_list_after(self):
2232
self.resource.get_instances = Mock()
2333
self.resource.list(created_after=date(2011, 1, 1))
24-
self.resource.get_instances.assert_called_with(params={
25-
"DateCreated>": "2011-01-01"})
34+
self.params["DateCreated>"] = "2011-01-01"
35+
self.resource.get_instances.assert_called_with(self.params)
2636

2737
def test_list_on(self):
2838
self.resource.get_instances = Mock()
2939
self.resource.list(created=date(2011, 1, 1))
30-
self.resource.get_instances.assert_called_with(params={
31-
"DateCreated": "2011-01-01"})
40+
self.params["DateCreated"] = "2011-01-01"
41+
self.resource.get_instances.assert_called_with(self.params)
3242

3343
def test_list_before(self):
3444
self.resource.get_instances = Mock()
3545
self.resource.list(created_before=date(2011, 1, 1))
36-
self.resource.get_instances.assert_called_with(params={
37-
"DateCreated<": "2011-01-01"})
46+
self.params["DateCreated<"] = "2011-01-01"
47+
self.resource.get_instances.assert_called_with(self.params)
3848

3949

4050

‎tests/test_core.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from twilio.rest.resources import transform_params
1010
from twilio.rest.resources import convert_keys
1111
from twilio.rest.resources import convert_case
12+
from twilio.rest.resources import convert_boolean
1213
from twilio.rest.resources import normalize_dates
1314

1415

@@ -66,6 +67,11 @@ def test_convert_case(self):
6667
self.assertEquals(convert_case("to"), "To")
6768
self.assertEquals(convert_case("frienldy_name"), "FrienldyName")
6869

70+
def test_convert_bool(self):
71+
self.assertEquals(convert_boolean(False), "false")
72+
self.assertEquals(convert_boolean(True), "true")
73+
self.assertEquals(convert_boolean(1), 1)
74+
6975
def test_convert_keys(self):
7076
d = {
7177
"from_": 0,

‎tests/test_phone_numbers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,29 +26,29 @@ def test_application_sid(self):
2626
resource.update_instance = Mock()
2727
resource.update("SID", application_sid="foo")
2828
resource.update_instance.assert_called_with(
29-
"SID", {"VoiceApplicationSid": "foo", "SmsApplicationSid": "foo"})
29+
"SID", {"voice_application_sid": "foo", "sms_application_sid": "foo"})
3030

3131
def test_voice_application_sid(self):
3232
resource = PhoneNumbers(self.uri, self.auth)
3333
resource.update_instance = Mock()
3434
resource.update("SID", voice_application_sid="foo")
3535
resource.update_instance.assert_called_with(
36-
"SID", {"VoiceApplicationSid": "foo"})
36+
"SID", {"voice_application_sid": "foo"})
3737

3838
def test_sms_application_sid(self):
3939
resource = PhoneNumbers(self.uri, self.auth)
4040
resource.update_instance = Mock()
4141
resource.update("SID", sms_application_sid="foo")
4242
resource.update_instance.assert_called_with(
43-
"SID", {"SmsApplicationSid": "foo"})
43+
"SID", {"sms_application_sid": "foo"})
4444

4545

4646
def test_status_callback_url(self):
4747
resource = PhoneNumbers(self.uri, self.auth)
4848
resource.update_instance = Mock()
4949
resource.update("SID", status_callback="foo")
5050
resource.update_instance.assert_called_with(
51-
"SID", {"StatusCallback": "foo"})
51+
"SID", {"status_callback": "foo"})
5252

5353
def test_transfer(self):
5454
resource = PhoneNumbers(self.uri, self.auth)

‎tests/test_sms_messages.py

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,36 @@
77
from mock import patch, Mock
88
from twilio.rest.resources import SmsMessages
99

10+
DEFAULT = {
11+
'From': None,
12+
'DateSent<': None,
13+
'DateSent>': None,
14+
'DateSent': None,
15+
}
1016

1117
class SmsTest(unittest.TestCase):
1218

1319
def setUp(self):
1420
self.resource = SmsMessages("foo", ("sid", "token"))
21+
self.params = DEFAULT.copy()
1522

1623
def test_list_on(self):
1724
self.resource.get_instances = Mock()
1825
self.resource.list(date_sent=date(2011, 1, 1))
19-
self.resource.get_instances.assert_called_with(params={
20-
"DateSent": "2011-01-01"})
26+
self.params['DateSent'] = "2011-01-01"
27+
self.resource.get_instances.assert_called_with(self.params)
2128

2229
def test_list_after(self):
2330
self.resource.get_instances = Mock()
2431
self.resource.list(after=date(2011, 1, 1))
25-
self.resource.get_instances.assert_called_with(params={
26-
"DateSent>": "2011-01-01"})
32+
self.params['DateSent>'] = "2011-01-01"
33+
self.resource.get_instances.assert_called_with(self.params)
2734

2835
def test_list_before(self):
2936
self.resource.get_instances = Mock()
3037
self.resource.list(before=date(2011, 1, 1))
31-
self.resource.get_instances.assert_called_with(params={
32-
"DateSent<": "2011-01-01"})
38+
self.params['DateSent<'] = "2011-01-01"
39+
self.resource.get_instances.assert_called_with(self.params)
3340

3441

3542

0 commit comments

Comments
 (0)
0