diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-28 10:50:57 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-28 10:50:57 +0000 |
commit | 61eaa6ec64456d58b269f8f69c92feb4f339b6b9 (patch) | |
tree | 4b6081e15b22f8166803baa28fe52a7cb3fdd0f0 /tests/rest/client/v1 | |
parent | No chdir (diff) | |
parent | Up get_rooms_for_user cache size (diff) | |
download | synapse-61eaa6ec64456d58b269f8f69c92feb4f339b6b9.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'tests/rest/client/v1')
-rw-r--r-- | tests/rest/client/v1/test_rooms.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index cd03106e88..2fe6f695f5 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -1045,8 +1045,20 @@ class RoomMessageListTestCase(RestTestCase): self.assertTrue("end" in response) @defer.inlineCallbacks - def test_stream_token_is_rejected(self): + def test_stream_token_is_rejected_for_back_pagination(self): (code, response) = yield self.mock_resource.trigger_get( - "/rooms/%s/messages?access_token=x&from=s0_0_0_0" % + "/rooms/%s/messages?access_token=x&from=s0_0_0_0_0&dir=b" % self.room_id) self.assertEquals(400, code) + + @defer.inlineCallbacks + def test_stream_token_is_accepted_for_fwd_pagianation(self): + token = "s0_0_0_0_0" + (code, response) = yield self.mock_resource.trigger_get( + "/rooms/%s/messages?access_token=x&from=%s" % + (self.room_id, token)) + self.assertEquals(200, code) + self.assertTrue("start" in response) + self.assertEquals(token, response['start']) + self.assertTrue("chunk" in response) + self.assertTrue("end" in response) \ No newline at end of file |