paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace /json/get_old_messages with REST style route.

Browse Source
This commit is contained in:
Ashish
2016-04-02 01:25:17 +05:30
committed by Tim Abbott
parent 8fc8717409
commit cb8da46bbf
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/message_store.js
View File

@@ -489,8 +489,8 @@ exports.load_old_messages = function load_old_messages(opts) {
data.use_first_unread_anchor = true; data.use_first_unread_anchor = true;
} }
channel.post({ channel.get({
url: '/json/get_old_messages', url: '/json/messages',
data: data, data: data,
idempotent: true, idempotent: true,
success: function (data) { success: function (data) {

2
tools/deprecated/stress-test/stress-test.coffee
View File

@@ -43,7 +43,7 @@ class ZulipSession extends Session
@update_active_status() @update_active_status()
@get '/json/bots' @get '/json/bots'
@post '/json/get_old_messages', { @get '/json/messages', {
anchor: @pointer anchor: @pointer
num_before: 200 num_before: 200
num_after: 200 num_after: 200

2
zerver/lib/test_helpers.py
View File

@@ -281,7 +281,7 @@ class AuthedTestCase(TestCase):
def get_old_messages(self, anchor=1, num_before=100, num_after=100): def get_old_messages(self, anchor=1, num_before=100, num_after=100):
post_params = {"anchor": anchor, "num_before": num_before, post_params = {"anchor": anchor, "num_before": num_before,
"num_after": num_after} "num_after": num_after}
result = self.client.post("/json/get_old_messages", dict(post_params)) result = self.client.get("/json/messages", dict(post_params))
data = ujson.loads(result.content) data = ujson.loads(result.content)
return data['messages'] return data['messages']

14
zerver/test_messages.py
View File

@@ -755,7 +755,7 @@ class GetOldMessagesTest(AuthedTestCase):
def post_with_params(self, modified_params): def post_with_params(self, modified_params):
post_params = {"anchor": 1, "num_before": 1, "num_after": 1} post_params = {"anchor": 1, "num_before": 1, "num_after": 1}
post_params.update(modified_params) post_params.update(modified_params)
result = self.client.post("/json/get_old_messages", dict(post_params)) result = self.client.get("/json/messages", dict(post_params))
self.assert_json_success(result) self.assert_json_success(result)
return ujson.loads(result.content) return ujson.loads(result.content)
@@ -787,7 +787,7 @@ class GetOldMessagesTest(AuthedTestCase):
def test_successful_get_old_messages(self): def test_successful_get_old_messages(self):
""" """
A call to /json/get_old_messages with valid parameters returns a list of A call to GET /json/messages with valid parameters returns a list of
messages. messages.
""" """
self.login("hamlet@zulip.com") self.login("hamlet@zulip.com")
@@ -976,7 +976,7 @@ class GetOldMessagesTest(AuthedTestCase):
for i in range(len(required_args)): for i in range(len(required_args)):
post_params = dict(required_args[:i] + required_args[i + 1:]) post_params = dict(required_args[:i] + required_args[i + 1:])
result = self.client.post("/json/get_old_messages", post_params) result = self.client.get("/json/messages", post_params)
self.assert_json_error(result, self.assert_json_error(result,
"Missing '%s' argument" % (required_args[i][0],)) "Missing '%s' argument" % (required_args[i][0],))
@@ -999,7 +999,7 @@ class GetOldMessagesTest(AuthedTestCase):
[(other_param, 0) for other_param in \ [(other_param, 0) for other_param in \
int_params[:idx] + int_params[idx + 1:]] int_params[:idx] + int_params[idx + 1:]]
) )
result = self.client.post("/json/get_old_messages", post_params) result = self.client.get("/json/messages", post_params)
self.assert_json_error(result, self.assert_json_error(result,
"Bad value for '%s': %s" % (param, type)) "Bad value for '%s': %s" % (param, type))
@@ -1015,7 +1015,7 @@ class GetOldMessagesTest(AuthedTestCase):
'{foo: 3}', '[1,2]', '[["x","y","z"]]') '{foo: 3}', '[1,2]', '[["x","y","z"]]')
for type in bad_types: for type in bad_types:
post_params = dict(other_params + [("narrow", type)]) post_params = dict(other_params + [("narrow", type)])
result = self.client.post("/json/get_old_messages", post_params) result = self.client.get("/json/messages", post_params)
self.assert_json_error(result, self.assert_json_error(result,
"Bad value for 'narrow': %s" % (type,)) "Bad value for 'narrow': %s" % (type,))
@@ -1040,7 +1040,7 @@ class GetOldMessagesTest(AuthedTestCase):
for operator in ['', 'foo', 'stream:verona', '__init__']: for operator in ['', 'foo', 'stream:verona', '__init__']:
narrow = [dict(operator=operator, operand='')] narrow = [dict(operator=operator, operand='')]
params = dict(anchor=0, num_before=0, num_after=0, narrow=ujson.dumps(narrow)) params = dict(anchor=0, num_before=0, num_after=0, narrow=ujson.dumps(narrow))
result = self.client.post("/json/get_old_messages", params) result = self.client.get("/json/messages", params)
self.assert_json_error_contains(result, self.assert_json_error_contains(result,
"Invalid narrow operator: unknown operator") "Invalid narrow operator: unknown operator")
@@ -1049,7 +1049,7 @@ class GetOldMessagesTest(AuthedTestCase):
for operand in operands: for operand in operands:
post_params = dict(other_params + [ post_params = dict(other_params + [
("narrow", ujson.dumps([[operator, operand]]))]) ("narrow", ujson.dumps([[operator, operand]]))])
result = self.client.post("/json/get_old_messages", post_params) result = self.client.get("/json/messages", post_params)
self.assert_json_error_contains(result, error_msg) self.assert_json_error_contains(result, error_msg)
def test_bad_narrow_stream_content(self): def test_bad_narrow_stream_content(self):