paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

search tests: Create users up front.

Browse Source 
This creates a little bit of noise in some
tests where we don't care about users, but
it's worth avoiding confusion about which
users exist at which time.  Also the noisy
aspects here may actually catch regressions.

Finally, if the noise gets annoying, we can
do things like rename "Ted" not to collide
with the "Test" stream.
This commit is contained in:
Steve Howell
2020-05-26 14:06:57 +00:00
committed by Steve Howell
parent 0cc5a8e185
commit ea0810e13f
2 changed files with 81 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
frontend_tests/node_tests/search_suggestion.js
View File

@@ -35,12 +35,37 @@ const bob = {
user_id: 42,
};
const ted =
{
email: 'ted@zulip.com',
user_id: 101,
full_name: 'Ted Smith',
};
const alice =
{
email: 'alice@zulip.com',
user_id: 102,
full_name: 'Alice Ignore',
};
const jeff =
{
email: 'jeff@zulip.com',
user_id: 103,
full_name: 'Jeff Zoolipson',
};
const noop = () => {};
function init() {
people.init();
people.add(bob);
people.add(me);
people.add(ted);
people.add(alice);
people.add(jeff);
people.initialize_current_user(me.user_id);
}
init();
@@ -103,29 +128,13 @@ run_test('private_suggestions', () => {
return;
};
const ted =
{
email: 'ted@zulip.com',
user_id: 101,
full_name: 'Ted Smith',
};
const alice =
{
email: 'alice@zulip.com',
user_id: 102,
full_name: 'Alice Ignore',
};
people.add(ted);
people.add(alice);
let query = 'is:private';
let suggestions = get_suggestions('', query);
let expected = [
"is:private",
"pm-with:alice@zulip.com",
"pm-with:bob@zulip.com",
"pm-with:jeff@zulip.com",
"pm-with:myself@zulip.com",
"pm-with:ted@zulip.com",
];
@@ -278,31 +287,6 @@ run_test('group_suggestions', () => {
},
});
const ted =
{
email: 'ted@zulip.com',
user_id: 101,
full_name: 'Ted Smith',
};
const alice =
{
email: 'alice@zulip.com',
user_id: 102,
full_name: 'Alice Ignore',
};
const jeff =
{
email: 'jeff@zulip.com',
user_id: 103,
full_name: 'Jeff Zoolipson',
};
people.add(ted);
people.add(alice);
people.add(jeff);
// Entering a comma in a pm-with query should immediately generate
// suggestions for the next person.
let query = 'pm-with:bob@zulip.com,';
@@ -598,6 +582,9 @@ run_test('check_is_suggestions', () => {
'is:mentioned',
'is:alerted',
'is:unread',
'sender:alice@zulip.com',
'pm-with:alice@zulip.com',
'group-pm-with:alice@zulip.com',
'has:image',
];
assert.deepEqual(suggestions.strings, expected);
@@ -813,9 +800,12 @@ run_test('sent_by_me_suggestions', () => {
base_query = 'is:starred';
suggestions = get_suggestions(base_query, query);
expected = [
"sender:",
"sender:myself@zulip.com",
"sender:bob@zulip.com",
'sender:',
'sender:myself@zulip.com',
'sender:alice@zulip.com',
'sender:bob@zulip.com',
'sender:jeff@zulip.com',
'sender:ted@zulip.com',
];
assert.deepEqual(suggestions.strings, expected);
});
@@ -845,7 +835,10 @@ run_test('topic_suggestions', () => {
stream_topic_history.reset();
suggestions = get_suggestions('', 'te');
expected = [
"te",
'te',
'sender:ted@zulip.com',
'pm-with:ted@zulip.com',
'group-pm-with:ted@zulip.com',
];
assert.deepEqual(suggestions.strings, expected);
@@ -863,9 +856,12 @@ run_test('topic_suggestions', () => {
suggestions = get_suggestions('', 'te');
expected = [
"te",
"stream:office topic:team",
"stream:office topic:test",
'te',
'sender:ted@zulip.com',
'pm-with:ted@zulip.com',
'group-pm-with:ted@zulip.com',
'stream:office topic:team',
'stream:office topic:test',
];
assert.deepEqual(suggestions.strings, expected);

79
frontend_tests/node_tests/search_suggestion_legacy.js
View File

@@ -34,10 +34,35 @@ const bob = {
user_id: 42,
};
const ted =
{
email: 'ted@zulip.com',
user_id: 101,
full_name: 'Ted Smith',
};
const alice =
{
email: 'alice@zulip.com',
user_id: 102,
full_name: 'Alice Ignore',
};
const jeff =
{
email: 'jeff@zulip.com',
user_id: 103,
full_name: 'Jeff Zoolipson',
};
function init() {
people.init();
people.add(bob);
people.add(me);
people.add(ted);
people.add(alice);
people.add(jeff);
people.initialize_current_user(me.user_id);
}
init();
@@ -98,29 +123,13 @@ run_test('private_suggestions', () => {
return;
};
const ted =
{
email: 'ted@zulip.com',
user_id: 101,
full_name: 'Ted Smith',
};
const alice =
{
email: 'alice@zulip.com',
user_id: 102,
full_name: 'Alice Ignore',
};
people.add(ted);
people.add(alice);
let query = 'is:private';
let suggestions = search.get_suggestions_legacy(query);
let expected = [
"is:private",
"pm-with:alice@zulip.com",
"pm-with:bob@zulip.com",
"pm-with:jeff@zulip.com",
"pm-with:myself@zulip.com",
"pm-with:ted@zulip.com",
];
@@ -275,31 +284,6 @@ run_test('group_suggestions', () => {
},
});
const ted =
{
email: 'ted@zulip.com',
user_id: 101,
full_name: 'Ted Smith',
};
const alice =
{
email: 'alice@zulip.com',
user_id: 102,
full_name: 'Alice Ignore',
};
const jeff =
{
email: 'jeff@zulip.com',
user_id: 103,
full_name: 'Jeff Zoolipson',
};
people.add(ted);
people.add(alice);
people.add(jeff);
// Entering a comma in a pm-with query should immediately generate
// suggestions for the next person.
let query = 'pm-with:bob@zulip.com,';
@@ -584,7 +568,6 @@ run_test('has_suggestions', () => {
});
run_test('check_is_suggestions', () => {
let query = 'i';
global.stream_data.subscribed_streams = function () {
return ['devel', 'office'];
};
@@ -592,6 +575,7 @@ run_test('check_is_suggestions', () => {
return;
};
let query = 'i';
let suggestions = search.get_suggestions_legacy(query);
let expected = [
'i',
@@ -600,6 +584,9 @@ run_test('check_is_suggestions', () => {
'is:mentioned',
'is:alerted',
'is:unread',
'sender:alice@zulip.com',
'pm-with:alice@zulip.com',
'group-pm-with:alice@zulip.com',
'has:image',
];
assert.deepEqual(suggestions.strings, expected);
@@ -814,6 +801,9 @@ run_test('topic_suggestions', () => {
suggestions = search.get_suggestions_legacy('te');
expected = [
"te",
"sender:ted@zulip.com",
"pm-with:ted@zulip.com",
"group-pm-with:ted@zulip.com",
];
assert.deepEqual(suggestions.strings, expected);
@@ -832,6 +822,9 @@ run_test('topic_suggestions', () => {
suggestions = search.get_suggestions_legacy('te');
expected = [
"te",
"sender:ted@zulip.com",
"pm-with:ted@zulip.com",
"group-pm-with:ted@zulip.com",
"stream:office topic:team",
"stream:office topic:test",
];