Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixed issues with ipmessaging #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 4, 2015
Merged

Fixed issues with ipmessaging #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00847b3
Fixed issues with ipmessaging
senthgit Dec 2, 2015
b5b4b66
Parameter name with type, prefixed with context
senthgit Dec 3, 2015
d5c0680
Added TwilioConversationsClient and TwilioIpMessagingClient
senthgit Dec 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 33 additions & 32 deletions tests/ip_messaging/test_channels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import unittest
from mock import patch, Mock
from twilio.rest.resources.ip_messaging import Channels, Channel
from tests.tools import create_mock_json
Expand All @@ -10,43 +11,43 @@
list_resource = Channels(BASE_URI, AUTH)


@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_channel(mock):
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
resp.status_code = 201
mock.return_value = resp
class ChannelTest(unittest.TestCase):

uri = "%s/Channels" % (BASE_URI)
list_resource.create(friendly_name='TestChannel')
exp_params = {
'FriendlyName': "TestChannel"
}
@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_channel(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
resp.status_code = 201
mock.return_value = resp

mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
use_json_extension=False)
uri = "%s/Channels" % (BASE_URI)
list_resource.create(friendly_name='TestChannel')
exp_params = {
'FriendlyName': "TestChannel"
}

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

@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(mock):
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
mock.return_value = resp
@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/channel_instance.json")
mock.return_value = resp

uri = "%s/Channels/%s" % (BASE_URI, CHANNEL_SID)
list_resource.get(CHANNEL_SID)
uri = "%s/Channels/%s" % (BASE_URI, CHANNEL_SID)
list_resource.get(CHANNEL_SID)

mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)
mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(self, req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

app = Channel(list_resource, "CH123")
app.delete()
uri = "%s/Channels/CH123" % (BASE_URI)
req.assert_called_with("DELETE", uri)
app = Channel(list_resource, "CH123")
app.delete()
uri = "%s/Channels/CH123" % (BASE_URI)
req.assert_called_with("DELETE", uri)
65 changes: 33 additions & 32 deletions tests/ip_messaging/test_credentials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import unittest
from mock import patch, Mock
from twilio.rest.resources.ip_messaging import Credentials, Credential
from tests.tools import create_mock_json
Expand All @@ -10,43 +11,43 @@
list_resource = Credentials(BASE_URI, AUTH)


@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_credential(mock):
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
resp.status_code = 201
mock.return_value = resp
class CredentialTest(unittest.TestCase):

uri = "%s/Credentials" % (BASE_URI)
list_resource.create('apn')
exp_params = {
'Type': "apn"
}
@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_credential(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
resp.status_code = 201
mock.return_value = resp

mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
use_json_extension=False)
uri = "%s/Credentials" % (BASE_URI)
list_resource.create('apn')
exp_params = {
'Type': "apn"
}

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

@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(mock):
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
mock.return_value = resp
@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/credential_instance.json")
mock.return_value = resp

uri = "%s/Credentials/%s" % (BASE_URI, CREDENTIAL_SID)
list_resource.get(CREDENTIAL_SID)
uri = "%s/Credentials/%s" % (BASE_URI, CREDENTIAL_SID)
list_resource.get(CREDENTIAL_SID)

mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)
mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(self, req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

app = Credential(list_resource, "IS123")
app.delete()
uri = "https://ip-messaging.twilio.com/v1/Credentials/IS123"
req.assert_called_with("DELETE", uri)
app = Credential(list_resource, "IS123")
app.delete()
uri = "https://ip-messaging.twilio.com/v1/Credentials/IS123"
req.assert_called_with("DELETE", uri)
65 changes: 33 additions & 32 deletions tests/ip_messaging/test_members.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import unittest
from mock import patch, Mock
from twilio.rest.resources.ip_messaging import Members, Member
from tests.tools import create_mock_json
Expand All @@ -10,43 +11,43 @@
list_resource = Members(BASE_URI, AUTH)


@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_member(mock):
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
resp.status_code = 201
mock.return_value = resp
class MemberTest(unittest.TestCase):

uri = "%s/Members" % (BASE_URI)
list_resource.create('test_identity')
exp_params = {
'Identity': "test_identity"
}
@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_member(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
resp.status_code = 201
mock.return_value = resp

mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
use_json_extension=False)
uri = "%s/Members" % (BASE_URI)
list_resource.create('test_identity')
exp_params = {
'Identity': "test_identity"
}

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

@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(mock):
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
mock.return_value = resp
@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/member_instance.json")
mock.return_value = resp

uri = "%s/Members/%s" % (BASE_URI, MEMBER_SID)
list_resource.get(MEMBER_SID)
uri = "%s/Members/%s" % (BASE_URI, MEMBER_SID)
list_resource.get(MEMBER_SID)

mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)
mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(self, req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

app = Member(list_resource, "MB123")
app.delete()
uri = "%s/Members/MB123" % (BASE_URI)
req.assert_called_with("DELETE", uri)
app = Member(list_resource, "MB123")
app.delete()
uri = "%s/Members/MB123" % (BASE_URI)
req.assert_called_with("DELETE", uri)
65 changes: 33 additions & 32 deletions tests/ip_messaging/test_messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import unittest
from mock import patch, Mock
from twilio.rest.resources.ip_messaging import Messages, Message
from tests.tools import create_mock_json
Expand All @@ -10,43 +11,43 @@
list_resource = Messages(BASE_URI, AUTH)


@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_message(mock):
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
resp.status_code = 201
mock.return_value = resp
class MessageTest(unittest.TestCase):

uri = "%s/Messages" % (BASE_URI)
list_resource.create('TestBody')
exp_params = {
'Body': "TestBody"
}
@patch("twilio.rest.resources.base.make_twilio_request")
def test_create_message(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
resp.status_code = 201
mock.return_value = resp

mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
use_json_extension=False)
uri = "%s/Messages" % (BASE_URI)
list_resource.create('TestBody')
exp_params = {
'Body': "TestBody"
}

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

@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(mock):
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
mock.return_value = resp
@patch("twilio.rest.resources.base.make_twilio_request")
def test_get(self, mock):
resp = create_mock_json("tests/resources/ip_messaging/message_instance.json")
mock.return_value = resp

uri = "%s/Messages/%s" % (BASE_URI, MESSAGE_SID)
list_resource.get(MESSAGE_SID)
uri = "%s/Messages/%s" % (BASE_URI, MESSAGE_SID)
list_resource.get(MESSAGE_SID)

mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)
mock.assert_called_with("GET", uri, auth=AUTH,
use_json_extension=False)

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(self, req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

@patch("twilio.rest.resources.base.Resource.request")
def test_delete(req):
""" Deleting a call should work """
resp = Mock()
resp.content = ""
resp.status_code = 204
req.return_value = resp, {}

app = Message(list_resource, "MS123")
app.delete()
uri = "%s/Messages/MS123" % (BASE_URI)
req.assert_called_with("DELETE", uri)
app = Message(list_resource, "MS123")
app.delete()
uri = "%s/Messages/MS123" % (BASE_URI)
req.assert_called_with("DELETE", uri)
Loading