Skip to content

Commit 995afd6

Browse files
committed
Added token override test
1 parent b85bbbf commit 995afd6

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

slackclient/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def send_to_websocket(self, data):
149149
150150
"""
151151
try:
152-
data = json.dumps(data)
152+
data = json.dumps(data, ensure_ascii=False)
153153
self.websocket.send(data)
154154
except Exception:
155155
self.rtm_connect(reconnect=True)
@@ -260,7 +260,7 @@ def api_call(self, method, timeout=None, **kwargs):
260260
response = self.api_requester.do(self.token, method, kwargs, timeout=timeout)
261261
response_json = json.loads(response.text)
262262
response_json["headers"] = dict(response.headers)
263-
return json.dumps(response_json)
263+
return json.dumps(response_json, ensure_ascii=False)
264264

265265
# TODO: Move the error types defined below into the .exceptions namespace. This would be a semver
266266
# major change because any clients already referencing these types in order to catch them

tests/test_slackrequest.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,20 @@ def test_auth_header(mocker):
4141

4242
assert "Bearer xoxb-123" in kwargs['headers']['Authorization']
4343

44+
def test_token_override(mocker):
45+
requests = mocker.patch('slackclient.slackrequest.requests')
46+
request = SlackRequest()
47+
48+
request.do('xoxb-123', 'chat.postMessage',
49+
{
50+
'token': "newtoken",
51+
'text': 'test',
52+
'channel': '#general'
53+
})
54+
args, kwargs = requests.post.call_args
55+
56+
assert "Bearer newtoken" in kwargs['headers']['Authorization']
57+
4458

4559
def test_plural_field(mocker):
4660
requests = mocker.patch('slackclient.slackrequest.requests')

0 commit comments

Comments
 (0)