8000 Merge branch 'ip-messaging' into edge · twilio/twilio-python@07bf639 · GitHub
[go: up one dir, main page]
Skip to content

Commit 07bf639

Browse files
author
Carlos Diaz-Padron
committed
Merge branch 'ip-messaging' into edge
2 parents 14cbaa2 + 08e1514 commit 07bf639

24 files changed

+841
-0
lines changed

‎tests/ip_messaging/__init__.py

Whitespace-only changes.

‎tests/ip_messaging/test_channels.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Channels, Channel
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1/Services/ISxxx"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
CHANNEL_SID = "CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Channels(BASE_URI, AUTH)
11+
12+
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
18+
19+
uri = "%s/Channels" % (BASE_URI)
20+
list_resource.create(friendly_name='TestChannel')
21+
exp_params = {
22+
'FriendlyName': "TestChannel"
23+
}
24+
25+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26+
use_json_extension=False)
27+
28+
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
33+
34+
uri = "%s/Channels/%s" % (BASE_URI, CHANNEL_SID)
35+
list_resource.get(CHANNEL_SID)
36+
37+
mock.assert_called_with("GET", uri, auth=AUTH,
38+
use_json_extension=False)
39+
40+
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)

‎tests/ip_messaging/test_credentials.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Credentials, Credential
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
CREDENTIAL_SID = "ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Credentials(BASE_URI, AUTH)
11+
12+
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
18+
19+
uri = "%s/Credentials" % (BASE_URI)
20+
list_resource.create('apn')
21+
exp_params = {
22+
'Type': "apn"
23+
}
24+
25+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26+
use_json_extension=False)
27+
28+
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
33+
34+
uri = "%s/Credentials/%s" % (BASE_URI, CREDENTIAL_SID)
35+
list_resource.get(CREDENTIAL_SID)
36+
37+
mock.assert_called_with("GET", uri, auth=AUTH,
38+
use_json_extension=False)
39+
40+
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)

‎tests/ip_messaging/test_members.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Members, Member
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1/Services/ISxxx/Channels/CHxxx"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
MEMBER_SID = "MBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Members(BASE_URI, AUTH)
11+
12+
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
18+
19+
uri = "%s/Members" % (BASE_URI)
20+
list_resource.create('test_identity')
21+
exp_params = {
22+
'Identity': "test_identity"
23+
}
24+
25+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26+
use_json_extension=False)
27+
28+
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
33+
34+
uri = "%s/Members/%s" % (BASE_URI, MEMBER_SID)
35+
list_resource.get(MEMBER_SID)
36+
37+
mock.assert_called_with("GET", uri, auth=AUTH,
38+
use_json_extension=False)
39+
40+
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)

‎tests/ip_messaging/test_messages.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Messages, Message
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1/Services/ISxxx/Channels/CHxxx"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
MESSAGE_SID = "MSaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Messages(BASE_URI, AUTH)
11+
12+
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
18+
19+
uri = "%s/Messages" % (BASE_URI)
20+
list_resource.create('TestBody')
21+
exp_params = {
22+
'Body': "TestBody"
23+
}
24+
25+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26+
use_json_extension=False)
27+
28+
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
33+
34+
uri = "%s/Messages/%s" % (BASE_URI, MESSAGE_SID)
35+
list_resource.get(MESSAGE_SID)
36+
37+
mock.assert_called_with("GET", uri, auth=AUTH,
38+
use_json_extension=False)
39+
40+
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)

‎tests/ip_messaging/test_roles.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Roles, Role
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1/Services/ISxxx"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
ROLE_SID = "ROaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Roles(BASE_URI, AUTH)
11+
12+
13+
@patch("twilio.rest.resources.base.make_twilio_request")
14+
def test_get(mock):
15+
resp = create_mock_json("tests/resources/ip_messaging/role_instance.json")
16+
mock.return_value = resp
17+
18+
uri = "%s/Roles/%s" % (BASE_URI, ROLE_SID)
19+
list_resource.get(ROLE_SID)
20+
21+
mock.assert_called_with("GET", uri, auth=AUTH,
22+
use_json_extension=False)
23+
24+
25+
@patch("twilio.rest.resources.base.Resource.request")
26+
def test_delete(req):
27+
""" Deleting a call should work """
28+
resp = Mock()
29+
resp.content = ""
30+
resp.status_code = 204
31+
req.return_value = resp, {}
32+
33+
app = Role(list_resource, "RO123")
34+
app.delete()
35+
uri = "%s/Roles/RO123" % (BASE_URI)
36+
req.assert_called_with("DELETE", uri)

‎tests/ip_messaging/test_services.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Services, Service
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
SERVICE_SID = "ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Services(BASE_URI, AUTH)
11+
12+
13+
@patch("twilio.rest.resources.base.make_twilio_request")
14+
def test_create_service(mock):
15+
resp = create_mock_json("tests/resources/ip_messaging/service_instance.json")
16+
resp.status_code = 201
17+
mock.return_value = resp
18+
19+
uri = "%s/Services" % (BASE_URI)
20+
list_resource.create('TestService')
21+
exp_params = {
22+
'FriendlyName': "TestService"
23+
}
24+
25+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26+
use_json_extension=False)
27+
28+
29+
@patch("twilio.rest.resources.base.make_twilio_request")
30+
def test_get(mock):
31+
resp = create_mock_json("tests/resources/ip_messaging/service_instance.json")
32+
mock.return_value = resp
33+
34+
uri = "%s/Services/%s" % (BASE_URI, SERVICE_SID)
35+
list_resource.get(SERVICE_SID)
36+
37+
mock.assert_called_with("GET", uri, auth=AUTH,
38+
use_json_extension=False)
39+
40+
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 = Service(list_resource, "IS123")
50+
app.delete()
51+
uri = "https://ip-messaging.twilio.com/v1/Services/IS123"
52+
req.assert_called_with("DELETE", uri)

‎tests/ip_messaging/test_users.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
from mock import patch, Mock
2+
from twilio.rest.resources.ip_messaging import Users, User
3+
from tests.tools import create_mock_json
4+
5+
BASE_URI = "https://ip-messaging.twilio.com/v1/Services/ISxxx"
6+
ACCOUNT_SID = "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
7+
AUTH = (ACCOUNT_SID, "token")
8+
USER_SID = "USaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
10+
list_resource = Users(BASE_URI, AUTH)
11+
12+
13+
@patch("twilio.rest.resources.base.make_twilio_request")
14+
def test_create_user(mock):
15+
resp = create_mock_json("tests/resources/ip_messaging/user_instance.json")
16+
resp.status_code = 201
17+
mock.return_value = resp
18+
19+
uri = "%s/Users" % (BASE_URI)
20+
list_resource.create('test_id')
21+
exp_params = {
22+
'Id': "test_id"
23+
}
24+
25+
mock.assert_called_with("POST", uri, data=exp_params, auth=AUTH,
26+
use_json_extension=False)
27+
28+
29+
@patch("twilio.rest.resources.base.make_twilio_request")
30+
def test_get(mock):
31+
resp = create_mock_json("tests/resources/ip_messaging/user_instance.json")
32+
mock.return_value = resp
33+
34+
uri = "%s/Users/%s" % (BASE_URI, USER_SID)
35+
list_resource.get(USER_SID)
36+
37+
mock.assert_called_with("GET", uri, auth=AUTH,
38+
use_json_extension=False)
39+
40+
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 = User(list_resource, "US123")
50+
app.delete()
51+
uri = "%s/Users/US123" % (BASE_URI)
52+
req.assert_called_with("DELETE", uri)

‎tests/resources/ip_messaging/channel_instance.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"sid": "CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4+
"service_sid": "ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"friendly_name": "update",
6+
"attributes": "",
7+
"date_created": "2015-08-20T09:30:24Z",
8+
"date_updated": "2015-08-20T09:30:24Z",
9+
"created_by": "system",
10+
"url": "https://ip-messaging.stage.twilio.com/v1/Services/ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Channels/CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
11+
"links": {
12+
"members": "https://ip-messaging.stage.twilio.com/v1/Services/ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Channels/CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Member",
13+
"messages": "https://ip-messaging.stage.twilio.com/v1/Services/ISaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Channels/CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Messages"
14+
}
15+
}

‎tests/resources/ip_messaging/credential_instance.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"account_sid":"ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"sid":"CRaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4+
"friendly_name":"MyApp APN Certificate",
5+
"type":"apn",
6+
"date_created":"2015-06-30T21:16:50Z",
7+
"date_updated":"2015-07-30T21:16:50Z"
8+
}

‎tests/resources/ip_messaging/member_instance.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"sid": "MBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
3+
"account_sid": "ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
4+
"channel_sid": "CHaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
5+
"space_sid": "SPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
6+
"id": "carl@twilio.com",
7+
"role": "admin",
8+
"url": "/v1/Spaces/SPxx/Channels/CHxx/Members/MBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
9+
}

0 commit comments

Comments
 (0)
0