CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-06-21 21:32:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hashchange: Move parse_narrow to hash_util.js.

Browse Source 
The goal here was to enforce 100% coverage on
parse_narrow, but the code has an unreachable line
and is overly tolerant of bogus urls.  This will
be fixed in the next commit.
This commit is contained in:
Steve Howell 2018-12-04 22:24:03 +00:00 committed by Tim Abbott
parent dac543891f
commit bcb142e68e
5 changed files with 47 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontend_tests/node_tests/hash_util.js
View File

@ -63,6 +63,19 @@ run_test('hash_util', () => {
encode_decode_operand(operator, operand, 'testing.20123');
});
run_test('test_parse_narrow', () => {
assert.deepEqual(
hash_util.parse_narrow(['narrow', 'stream', '11-social']),
[{negated: false, operator: 'stream', operand: '11-social'}]
);
// This should probably return undefined.
assert.deepEqual(
hash_util.parse_narrow(['narrow', 'BOGUS']),
[{negated: false, operator: 'BOGUS', operand: ''}]
);
});
run_test('test_stream_edit_uri', () => {
var sub = {
name: 'research & development',

10
frontend_tests/node_tests/hashchange.js
View File

@ -37,7 +37,7 @@ run_test('operators_round_trip', () => {
hash = hash_util.operators_to_hash(operators);
assert.equal(hash, '#narrow/stream/devel/topic/algol');
narrow = hashchange.parse_narrow(hash.split('/'));
narrow = hash_util.parse_narrow(hash.split('/'));
assert.deepEqual(narrow, [
{operator: 'stream', operand: 'devel', negated: false},
{operator: 'topic', operand: 'algol', negated: false},
@ -50,7 +50,7 @@ run_test('operators_round_trip', () => {
hash = hash_util.operators_to_hash(operators);
assert.equal(hash, '#narrow/stream/devel/-topic/visual.20c.2B.2B');
narrow = hashchange.parse_narrow(hash.split('/'));
narrow = hash_util.parse_narrow(hash.split('/'));
assert.deepEqual(narrow, [
{operator: 'stream', operand: 'devel', negated: false},
{operator: 'topic', operand: 'visual c++', negated: true},
@ -67,7 +67,7 @@ run_test('operators_round_trip', () => {
];
hash = hash_util.operators_to_hash(operators);
assert.equal(hash, '#narrow/stream/987-Florida.2C-USA');
narrow = hashchange.parse_narrow(hash.split('/'));
narrow = hash_util.parse_narrow(hash.split('/'));
assert.deepEqual(narrow, [
{operator: 'stream', operand: 'Florida, USA', negated: false},
]);
@ -78,7 +78,7 @@ run_test('operators_trailing_slash', () => {
var narrow;
hash = '#narrow/stream/devel/topic/algol/';
narrow = hashchange.parse_narrow(hash.split('/'));
narrow = hash_util.parse_narrow(hash.split('/'));
assert.deepEqual(narrow, [
{operator: 'stream', operand: 'devel', negated: false},
{operator: 'topic', operand: 'algol', negated: false},
@ -102,7 +102,7 @@ run_test('people_slugs', () => {
];
hash = hash_util.operators_to_hash(operators);
assert.equal(hash, '#narrow/sender/42-alice');
narrow = hashchange.parse_narrow(hash.split('/'));
narrow = hash_util.parse_narrow(hash.split('/'));
assert.deepEqual(narrow, [
{operator: 'sender', operand: 'alice@example.com', negated: false},
]);

27
static/js/hash_util.js
View File

@ -127,6 +127,33 @@ exports.stream_edit_uri = function (sub) {
return hash;
};
exports.parse_narrow = function (hash) {
var i;
var operators = [];
for (i = 1; i < hash.length; i += 2) {
// We don't construct URLs with an odd number of components,
// but the user might write one.
try {
var operator = exports.decodeHashComponent(hash[i]);
// Do not parse further if empty operator encountered.
if (operator === '') {
break;
}
var operand = exports.decode_operand(operator, hash[i + 1] || '');
var negated = false;
if (operator[0] === '-') {
negated = true;
operator = operator.slice(1);
}
operators.push({negated: negated, operator: operator, operand: operand});
} catch (err) {
return;
}
}
return operators;
};
return exports;
}());

29
static/js/hashchange.js
View File

@ -47,33 +47,6 @@ exports.save_narrow = function (operators) {
exports.changehash(new_hash);
};
exports.parse_narrow = function (hash) {
var i;
var operators = [];
for (i = 1; i < hash.length; i += 2) {
// We don't construct URLs with an odd number of components,
// but the user might write one.
try {
var operator = hash_util.decodeHashComponent(hash[i]);
// Do not parse further if empty operator encountered.
if (operator === '') {
break;
}
var operand = hash_util.decode_operand(operator, hash[i + 1] || '');
var negated = false;
if (operator[0] === '-') {
negated = true;
operator = operator.slice(1);
}
operators.push({negated: negated, operator: operator, operand: operand});
} catch (err) {
return;
}
}
return operators;
};
function activate_home_tab() {
ui_util.change_tab_to("#home");
narrow.deactivate();
@ -118,7 +91,7 @@ function do_hashchange_normal(from_reload) {
switch (hash[0]) {
case "#narrow":
ui_util.change_tab_to("#home");
var operators = exports.parse_narrow(hash);
var operators = hash_util.parse_narrow(hash);
if (operators === undefined) {
// If the narrow URL didn't parse, clear
// window.location.hash and send them to the home tab

2
tools/test-js-with-node
View File

@ -44,7 +44,7 @@ enforce_fully_covered = {
'static/js/fenced_code.js',
'static/js/fetch_status.js',
'static/js/filter.js',
'static/js/hash_util.js',
# 'static/js/hash_util.js',
'static/js/keydown_util.js',
'static/js/input_pill.js',
'static/js/list_cursor.js',