Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

stream_topic_history: Fix incorrectly migrated field name. 

In ee0d4541b4, we renamed the topic_date
-> stream_topic_history, and in the process renamed some local object
properties from .name => .topic_name, and accidentally change the
type for the data from the server as well.

The test fixtures were incorrectly migrated in the same way, so we fix
that as well.
This commit is contained in:
Tim Abbott 2020-04-17 13:08:17 -07:00
parent 71ab86f5f7
commit 497383cc12
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend_tests/node_tests/stream_topic_history.js
View File

@ -128,9 +128,9 @@ run_test('server_history', () => {
function add_server_history() {
stream_topic_history.add_history(stream_id, [
{ topic_name: 'local', max_id: 501 },
{ topic_name: 'hist2', max_id: 31 },
{ topic_name: 'hist1', max_id: 30 },
{ name: 'local', max_id: 501 },
{ name: 'hist2', max_id: 31 },
{ name: 'hist1', max_id: 30 },
]);
}
@ -183,8 +183,8 @@ run_test('server_history', () => {
// topics in the future, if they dropped off due to renames,
// but that is probably an edge case we can ignore for now.
stream_topic_history.add_history(stream_id, [
{ topic_name: 'hist2', max_id: 931 },
{ topic_name: 'hist3', max_id: 5 },
{ name: 'hist2', max_id: 931 },
{ name: 'hist3', max_id: 5 },
]);
history = stream_topic_history.get_recent_topic_names(stream_id);
assert.deepEqual(history, ['hist2', 'hist1', 'hist3']);
@ -253,9 +253,9 @@ run_test('server_history_end_to_end', () => {
const stream_id = 99;
const topics = [
{ topic_name: 'topic3', max_id: 501 },
{ topic_name: 'topic2', max_id: 31 },
{ topic_name: 'topic1', max_id: 30 },
{ name: 'topic3', max_id: 501 },
{ name: 'topic2', max_id: 31 },
{ name: 'topic1', max_id: 30 },
];
let get_success_callback;

2
static/js/stream_topic_history.js
View File

@ -115,7 +115,7 @@ exports.per_stream_history = function (stream_id) {
// client can maintain for newer topics.
for (const obj of server_history) {
const topic_name = obj.topic_name;
const topic_name = obj.name;
const message_id = obj.max_id;
const existing = topics.get(topic_name);