8000 Remove CapabilityAPI · bcorwin/twilio-python@7be9163 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7be9163

Browse files
jwitz10jwitz10
committed
Remove CapabilityAPI
Fix formatting problems (whitespaces at end of lines, line length of 80 chars, two spaces before class names, new lines at end of file, no spaces between default parameter attributes,) Fix old capability test
1 parent 7f987b1 commit 7be9163

8 files changed

+617
-623
lines changed

‎tests/task_router/test_capability.py

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,22 @@ def test_defaults(self):
5959
(self.account_sid, self.worker_sid)
6060
)
6161
expected = [
62+
{
63+
'url':
64+
'https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities',
65+
'method': 'GET',
66+
'allow': True,
67+
'query_filter': {},
68+
'post_filter': {},
69+
},
70+
{
71+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/%s/Tasks/**' %
72+
(self.workspace_sid),
73+
'method': 'GET',
74+
'allow': True,
75+
'query_filter': {},
76+
'post_filter': {},
77+
},
6278
{
6379
'url': websocket_url,
6480
'method': 'GET',
@@ -74,13 +90,13 @@ def test_defaults(self):
7490
'post_filter': {},
7591
},
7692
{
77-
'url':
78-
'https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities',
93+
'url': 'https://taskrouter.twilio.com/v1/Workspaces/%s/Workers/%s' %
94+
(self.workspace_sid, self.worker_sid),
7995
'method': 'GET',
8096
'allow': True,
8197
'query_filter': {},
8298
'post_filter': {},
83-
},
99+
}
84100
]
85101
self.assertEqual(expected, decoded['policies'])
86102

@@ -140,6 +156,6 @@ def test_allow_task_reservation_updates(self):
140156
'method': 'POST',
141157
'allow': True,
142158
'query_filter': {},
143-
'post_filter': {'ReservationStatus': {'required': True}},
159+
'post_filter': {},
144160
}
145161
self.assertEqual(expected, decoded['policies'][-1])

‎tests/task_router/test_task_router_capability.py

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
import sys
2-
3-
import time
41
import unittest
52
import warnings
63

74
from twilio import jwt
8-
from twilio.task_router.capability import TaskRouterCapability
5+
from twilio.task_router import TaskRouterCapability
6+
97

108
class TaskRouterCapabilityTest(unittest.TestCase):
119

@@ -38,23 +36,23 @@ def test_workspace_default(self):
3836
get_policy = policies[0]
3937
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WS456", get_policy['url'])
4038
self.assertEqual("GET", get_policy['method'])
41-
self.assertTrue(get_policy['allowed'])
39+
self.assertTrue(get_policy['allow'])
4240
self.assertEqual({}, get_policy['query_filter'])
4341
self.assertEqual({}, get_policy['post_filter'])
4442

4543
# websocket POST
4644
post_policy = policies[1]
4745
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WS456", post_policy['url'])
4846
self.assertEqual("POST", post_policy['method'])
49-
self.assertTrue(post_policy['allowed'])
47+
self.assertTrue(post_policy['allow'])
5048
self.assertEqual({}, post_policy['query_filter'])
5149
self.assertEqual({}, post_policy['post_filter'])
5250

5351
# fetch GET
5452
fetch_policy = policies[2]
5553
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456", fetch_policy['url'])
5654
self.assertEqual("GET", fetch_policy['method'])
57-
self.assertTrue(fetch_policy['allowed'])
55+
self.assertTrue(fetch_policy['allow'])
5856
self.assertEqual({}, fetch_policy['query_filter'])
5957
self.assertEqual({}, fetch_policy['post_filter'])
6058

@@ -88,39 +86,39 @@ def test_worker_default(self):
8886
fetch_activity = policies[0]
8987
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", fetch_activity['url'])
9088
self.assertEqual("GET", fetch_activity['method'])
91-
self.assertTrue(fetch_activity['allowed'])
89+
self.assertTrue(fetch_activity['allow'])
9290
self.assertEqual({}, fetch_activity['query_filter'])
93< F438 /td>91
self.assertEqual({}, fetch_activity['post_filter'])
9492

9593
# reservation GET
9694
fetch_reservation = policies[1]
9795
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", fetch_reservation['url'])
9896
self.assertEqual("GET", fetch_reservation['method'])
99-
self.assertTrue(fetch_reservation['allowed'])
97+
self.assertTrue(fetch_reservation['allow'])
10098
self.assertEqual({}, fetch_reservation['query_filter'])
10199
self.assertEqual({}, fetch_reservation['post_filter'])
102100

103101
# websocket GET
104102
get_policy = policies[2]
105103
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", get_policy['url'])
106104
self.assertEqual("GET", get_policy['method'])
107-
self.assertTrue(get_policy['allowed'])
105+
self.assertTrue(get_policy['allow'])
108106
self.assertEqual({}, get_policy['query_filter'])
109107
self.assertEqual({}, get_policy['post_filter'])
110108

111109
# websocket POST
112110
post_policy = policies[3]
113111
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", post_policy['url'])
114112
self.assertEqual("POST", post_policy['method'])
115-
self.assertTrue(post_policy['allowed'])
113+
self.assertTrue(post_policy['allow'])
116114
self.assertEqual({}, post_policy['query_filter'])
117115
self.assertEqual({}, post_policy['post_filter'])
118116

119117
# fetch GET
120118
fetch_policy = policies[4]
121119
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", fetch_policy['url'])
122120
self.assertEqual("GET", fetch_policy['method'])
123-
self.assertTrue(fetch_policy['allowed'])
121+
self.assertTrue(fetch_policy['allow'])
124122
self.assertEqual({}, fetch_policy['query_filter'])
125123
self.assertEqual({}, fetch_policy['post_filter'])
126124

@@ -154,23 +152,23 @@ def test_task_queue_default(self):
154152
get_policy = policies[0]
155153
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WQ789", get_policy['url'])
156154
self.assertEqual("GET", get_policy['method'])
157-
self.assertTrue(get_policy['allowed'])
155+
self.assertTrue(get_policy['allow'])
158156
self.assertEqual({}, get_policy['query_filter'])
159157
self.assertEqual({}, get_policy['post_filter'])
160158

161159
# websocket POST
162160
post_policy = policies[1]
163161
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WQ789", post_policy['url'])
164162
self.assertEqual("POST", post_policy['method'])
165-
self.assertTrue(post_policy['allowed'])
163+
self.assertTrue(post_policy['allow'])
166164
self.assertEqual({}, post_policy['query_filter'])
167165
self.assertEqual({}, post_policy['post_filter'])
168166

169167
# fetch GET
170168
fetch_policy = policies[2]
171169
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/TaskQueues/WQ789", fetch_policy['url'])
172170
self.assertEqual("GET", fetch_policy['method'])
173-
self.assertTrue(fetch_policy['allowed'])
171+
self.assertTrue(fetch_policy['allow'])
174172
self.assertEqual({}, fetch_policy['query_filter'])
175173
self.assertEqual({}, fetch_policy['post_filter'])
176174

@@ -206,39 +204,39 @@ def test_deprecated_worker(self):
206204
fetch_activity = policies[0]
207205
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", fetch_activity['url'])
208206
self.assertEqual("GET", fetch_activity['method'])
209-
self.assertTrue(fetch_activity['allowed'])
207+
self.assertTrue(fetch_activity['allow'])
210208
self.assertEqual({}, fetch_activity['query_filter'])
211209
self.assertEqual({}, fetch_activity['post_filter'])
212210

213211
# reservation GET
214212
fetch_reservation = policies[1]
215213
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/Tasks/**", fetch_reservation['url'])
216214
self.assertEqual("GET", fetch_reservation['method'])
217-
self.assertTrue(fetch_reservation['allowed'])
215+
self.assertTrue(fetch_reservation['allow'])
218216
self.assertEqual({}, fetch_reservation['query_filter'])
219217
self.assertEqual({}, fetch_reservation['post_filter'])
220218

221219
# websocket GET
222220
get_policy = policies[2]
223221
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", get_policy['url'])
224222
self.assertEqual("GET", get_policy['method'])
225-
self.assertTrue(get_policy['allowed'])
223+
self.assertTrue(get_policy['allow'])
226224
self.assertEqual({}, get_policy['query_filter'])
227225
self.assertEqual({}, get_policy['post_filter'])
228226

229227
# websocket POST
230228
post_policy = policies[3]
231229
self.assertEqual("https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", post_policy['url'])
232230
self.assertEqual("POST", post_policy['method'])
233-
self.assertTrue(post_policy['allowed'])
231+
self.assertTrue(post_policy['allow'])
234232
self.assertEqual({}, post_policy['query_filter'])
235233
self.assertEqual({}, post_policy['post_filter'])
236234

237235
# fetch GET
238236
fetch_policy = policies[4]
239237
self.assertEqual("https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", fetch_policy['url'])
240238
self.assertEqual("GET", fetch_policy['method'])
241-
self.assertTrue(fetch_policy['allowed'])
239+
self.assertTrue(fetch_policy['allow'])
242240
self.assertEqual({}, fetch_policy['query_filter'])
243241
self.assertEqual({}, fetch_policy['post_filter'])
244242

@@ -264,6 +262,5 @@ def test_deprecated_worker(self):
264262
assert issubclass(w[-1].category, DeprecationWarning)
265263
assert "deprecated" in str(w[-1].message)
266264

267-
268265
if __name__ == "__main__":
269266
unittest.main()

0 commit comments

Comments
 (0)
0