8000 Merge pull request #239 from twilio/ip-messaging-fixes · rbarner14/twilio-python@56d226c · GitHub
[go: up one dir, main page]
Skip to content

Commit 56d226c

Browse files
senthgitsenthgit
committed
Merge pull request twilio#239 from twilio/ip-messaging-fixes
Fixed issues with ipmessaging
2 parents 0d2bef5 + d5c0680 commit 56d226c

File tree

15 files changed

+389
-239
lines changed

15 files changed

+389
-239
lines changed

‎tests/ip_messaging/test_channels.py

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import unittest
12
from mock import patch, Mock
23
from twilio.rest.resources.ip_messaging import Channels, Channel
34
from tests.tools import create_mock_json
@@ -10,43 +11,43 @@
1011
list_resource = Channels(BASE_URI, AUTH)
1112

1213

13-
@patch("twilio.rest.resources.base.make_twilio_request")
14-
def test_create_channel(mock):
15-
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
16-
resp.status_code = 201
17-
mock.return_value = resp
14+
class ChannelTest(unittest.TestCase):
1815

19-
uri = "%s/Channels" % (BASE_URI)
20-
list_resource.create(friendly_name='TestChannel')
21-
exp_params = {
22-
'FriendlyName': "TestChannel"
23-
}
16+
@patch("twilio.rest.resources.base.make_twilio_request")
17+
def test_create_channel(self, mock):
18+
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
19+
resp.status_code = 201
20+
mock.return_value = resp
2421

25-
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26-
use_json_extension=False)
22+
uri = "%s/Channels" % (BASE_URI)
23+
list_resource.create(friendly_name='TestChannel')
24+
exp_params = {
25+
'FriendlyName': "TestChannel"
26+
}
2727

28+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
29+
use_json_extension=False)
2830

29-
@patch("twilio.rest.resources.base.make_twilio_request")
30-
def test_get(mock):
31-
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
32-
mock.return_value = resp
31+
@patch("twilio.rest.resources.base.make_twilio_request")
32+
def test_get(self, mock):
33+
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
34+
mock.return_value = resp
3335

34-
uri = "%s/Channels/%s" % (BASE_URI, CHANNEL_SID)
35-
list_resource.get(CHANNEL_SID)
36+
uri = "%s/Channels/%s" % (BASE_URI, CHANNEL_SID)
37+
list_resource.get(CHANNEL_SID)
3638

37-
mock.assert_called_with("GET", uri, auth=AUTH,
38-
use_json_extension=False)
39+
mock.assert_called_with("GET", uri, auth=AUTH,
40+
use_json_extension=False)
3941

42+
@patch("twilio.rest.resources.base.Resource.request")
43+
def test_delete(self, req):
44+
""" Deleting a call should work """
45+
resp = Mock()
46+
resp.content = ""
47+
resp.status_code = 204
48+
req.return_value = resp, {}
4049

41-
@patch("twilio.rest.resources.base.Resource.request")
42-
def test_delete(req):
43-
""" Deleting a call should work """
44-
resp = Mock()
45-
resp.content = ""
46-
resp.status_code = 204
47-
req.return_value = resp, {}
48-
49-
app = Channel(list_resource, "CH123")
50-
app.delete()
51-
uri = "%s/Channels/CH123" % (BASE_URI)
52-
req.assert_called_with("DELETE", uri)
50+
app = Channel(list_resource, "CH123")
51+
app.delete()
52+
uri = "%s/Channels/CH123" % (BASE_URI)
53+
req.assert_called_with("DELETE", uri)

‎tests/ip_messaging/test_credentials.py

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import unittest
12
from mock import patch, Mock
23
from twilio.rest.resources.ip_messaging import Credentials, Credential
34
from tests.tools import create_mock_json
@@ -10,43 +11,43 @@
1011
list_resource = Credentials(BASE_URI, AUTH)
1112

1213

13-
@patch("twilio.rest.resources.base.make_twilio_request")
14-
def test_create_credential(mock):
15-
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
16-
resp.status_code = 201
17-
mock.return_value = resp
14+
class CredentialTest(unittest.TestCase):
1815

19-
uri = "%s/Credentials" % (BASE_URI)
20-
list_resource.create('apn')
21-
exp_params = {
22-
'Type': "apn"
23-
}
16+
@patch("twilio.rest.resources.base.make_twilio_request")
17+
def test_create_credential(self, mock):
18+
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
19+
resp.status_code = 201
20+
mock.return_value = resp
2421

25-
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26-
use_json_extension=False)
22+
uri = "%s/Credentials" % (BASE_URI)
23+
list_resource.create('apn')
24+
exp_params = {
25+
'Type': "apn"
26+
}
2727

28+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
29+
use_json_extension=False)
2830

29-
@patch("twilio.rest.resources.base.make_twilio_request")
30-
def test_get(mock):
31-
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
32-
mock.return_value = resp
31+
@patch("twilio.rest.resources.base.make_twilio_request")
32+
def test_get(self, mock):
33+
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
34+
mock.return_value = resp
3335

34-
uri = "%s/Credentials/%s" % (BASE_URI, CREDENTIAL_SID)
35-
list_resource.get(CREDENTIAL_SID)
36+
uri = "%s/Credentials/%s" % (BASE_URI, CREDENTIAL_SID)
37+
list_resource.get(CREDENTIAL_SID)
3638

37-
mock.assert_called_with("GET", uri, auth=AUTH,
38-
use_json_extension=False)
39+
mock.assert_called_with("GET", uri, auth=AUTH,
40+
use_json_extension=False)
3941

42+
@patch("twilio.rest.resources.base.Resource.request")
43+
def test_delete(self, req):
44+
""" Deleting a call should work """
45+
resp = Mock()
46+
resp.content = ""
47+
resp.status_code = 204
48+
req.return_value = resp, {}
4049

41-
@patch("twilio.rest.resources.base.Resource.request")
42-
def test_delete(req):
43-
""" Deleting a call should work """
44-
resp = Mock()
45-
resp.content = ""
46-
resp.status_code = 204
47-
req.return_value = resp, {}
48-
49-
app = Credential(list_resource, "IS123")
50-
app.delete()
51-
uri = "https://ip-messaging.twilio.com/v1/Credentials/IS123"
52-
req.assert_called_with("DELETE", uri)
50+
app = Credential(list_resource, "IS123")
51+
app.delete()
52+
uri = "https://ip-messaging.twilio.com/v1/Credentials/IS123"
53+
req.assert_called_with("DELETE", uri)

‎tests/ip_messaging/test_members.py

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import unittest
12
from mock import patch, Mock
23
from twilio.rest.resources.ip_messaging import Members, Member
34
from tests.tools import create_mock_json
@@ -10,43 +11,43 @@
1011
list_resource = Members(BASE_URI, AUTH)
1112

1213

13-
@patch("twilio.rest.resources.base.make_twilio_request")
14-
def test_create_member(mock):
15-
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
16-
resp.status_code = 201
17-
mock.return_value = resp
14+
class MemberTest(unittest.TestCase):
1815

19-
uri = "%s/Members" % (BASE_URI)
20-
list_resource.create('test_identity')
21-
exp_params = {
22-
'Identity': "test_identity"
23-
}
16+
@patch("twilio.rest.resources.base.make_twilio_request")
17+
def test_create_member(self, mock):
18+
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
19+
resp.status_code = 201
20+
mock.return_value = resp
2421

25-
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26-
use_json_extension=False)
22+
uri = "%s/Members" % (BASE_URI)
23+
list_resource.create('test_identity')
24+
exp_params = {
25+
'Identity': "test_identity"
26+
}
2727

28+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
179B 29+
use_json_extension=False)
2830

29-
@patch("twilio.rest.resources.base.make_twilio_request")
30-
def test_get(mock):
31-
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
32-
mock.return_value = resp
31+
@patch("twilio.rest.resources.base.make_twilio_request")
32+
def test_get(self, mock):
33+
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
34+
mock.return_value = resp
3335

34-
uri = "%s/Members/%s" % (BASE_URI, MEMBER_SID)
35-
list_resource.get(MEMBER_SID)
36+
uri = "%s/Members/%s" % (BASE_URI, MEMBER_SID)
37+
list_resource.get(MEMBER_SID)
3638

37-
mock.assert_called_with("GET", uri, auth=AUTH,
38-
use_json_extension=False)
39+
mock.assert_called_with("GET", uri, auth=AUTH,
40+
use_json_extension=False)
3941

42+
@patch("twilio.rest.resources.base.Resource.request")
43+
def test_delete(self, req):
44+
""" Deleting a call should work """
45+
resp = Mock()
46+
resp.content = ""
47+
resp.status_code = 204
48+
req.return_value = resp, {}
4049

41-
@patch("twilio.rest.resources.base.Resource.request")
42-
def test_delete(req):
43-
""" Deleting a call should work """
44-
resp = Mock()
45-
resp.content = ""
46-
resp.status_code = 204
47-
req.return_value = resp, {}
48-
49-
app = Member(list_resource, "MB123")
50-
app.delete()
51-
uri = "%s/Members/MB123" % (BASE_URI)
52-
req.assert_called_with("DELETE", uri)
50+
app = Member(list_resource, "MB123")
51+
app.delete()
52+
uri = "%s/Members/MB123" % (BASE_URI)
53+
req.assert_called_with("DELETE", uri)

‎tests/ip_messaging/test_messages.py

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import unittest
12
from mock import patch, Mock
23
from twilio.rest.resources.ip_messaging import Messages, Message
34
from tests.tools import create_mock_json
@@ -10,43 +11,43 @@
1011
list_resource = Messages(BASE_URI, AUTH)
1112

1213

13-
@patch("twilio.rest.resources.base.make_twilio_request")
14-
def test_create_message(mock):
15-
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
16-
resp.status_code = 201
17-
mock.return_value = resp
14+
class MessageTest(unittest.TestCase):
1815

19-
uri = "%s/Messages" % (BASE_URI)
20-
list_resource.create('TestBody')
21-
exp_params = {
22-
'Body': "TestBody"
23-
}
16+
@patch("twilio.rest.resources.base.make_twilio_request")
17+
def test_create_message(self, mock):
18+
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
19+
resp.status_code = 201
20+
mock.return_value = resp
2421

25-
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26-
use_json_extension=False)
22+
uri = "%s/Messages" % (BASE_URI)
23+
list_resource.create('TestBody')
24+
exp_params = {
25+
'Body': "TestBody"
26+
}
2727

28+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
29+
use_json_extension=False)
2830

29-
@patch("twilio.rest.resources.base.make_twilio_request")
30-
def test_get(mock):
31-
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
32-
mock.return_value = resp
31+
@patch("twilio.rest.resources.base.make_twilio_request")
32+
def test_get(self, mock):
33+
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
34+
mock.return_value = resp
3335

34-
uri = "%s/Messages/%s" % (BASE_URI, MESSAGE_SID)
35-
list_resource.get(MESSAGE_SID)
36+
uri = "%s/Messages/%s" % (BASE_URI, MESSAGE_SID)
37+
list_resource.get(MESSAGE_SID)
3638

37-
mock.assert_called_with("GET", uri, auth=AUTH,
38-
use_json_extension=False)
39+
mock.assert_called_with("GET", uri, auth=AUTH,
40+
use_json_extension=False)
3941

42+
@patch("twilio.rest.resources.base.Resource.request")
43+
def test_delete(self, req):
44+
""" Deleting a call should work """
45+
resp = Mock()
46+
resp.content = ""
47+
resp.status_code = 204
48+
req.return_value = resp, {}
4049

41-
@patch("twilio.rest.resources.base.Resource.request")
42-
def test_delete(req):
43-
""" Deleting a call should work """
44-
resp = Mock()
45-
resp.content = ""
46-
resp.status_code = 204
47-
req.return_value = resp, {}
48-
49-
app = Message(list_resource, "MS123")
50-
app.delete()
51-
uri = "%s/Messages/MS123" % (BASE_URI)
52-
req.assert_called_with("DELETE", uri)
50+
app = Message(list_resource, "MS123")
51+
app.delete()
52+
uri = "%s/Messages/MS123" % (BASE_URI)
53+
req.assert_called_with("DELETE", uri)

0 commit comments

Comments
 (0)
0