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

node tests: Remove unnecessary test_ui wrappers.

Browse Source
This commit is contained in:
Steve Howell
2021-02-23 12:14:54 +00:00
committed by Steve Howell
parent ac69450681
commit dbf514a055
5 changed files with 34 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
frontend_tests/node_tests/alert_words_ui.js
View File

@@ -16,12 +16,7 @@ alert_words.initialize({
alert_words: ["foo", "bar"],
});
function test_ui(label, f) {
// TODO: go back to run_test
run_test(label, f);
}
test_ui("render_alert_words_ui", () => {
run_test("render_alert_words_ui", () => {
const word_list = $("#alert_words_list");
const appended = [];
word_list.append = (rendered) => {
@@ -45,7 +40,7 @@ test_ui("render_alert_words_ui", () => {
assert(new_alert_word.is_focused());
});
test_ui("add_alert_word", (override) => {
run_test("add_alert_word", (override) => {
override(alert_words_ui, "render_alert_words_ui", () => {}); // we've already tested this above
alert_words_ui.set_up_alert_words();
@@ -100,7 +95,7 @@ test_ui("add_alert_word", (override) => {
assert(alert_word_status.visible());
});
test_ui("add_alert_word_keypress", (override) => {
run_test("add_alert_word_keypress", (override) => {
override(alert_words_ui, "render_alert_words_ui", () => {});
alert_words_ui.set_up_alert_words();
@@ -126,7 +121,7 @@ test_ui("add_alert_word_keypress", (override) => {
assert(called);
});
test_ui("remove_alert_word", (override) => {
run_test("remove_alert_word", (override) => {
override(alert_words_ui, "render_alert_words_ui", () => {});
alert_words_ui.set_up_alert_words();
@@ -173,7 +168,7 @@ test_ui("remove_alert_word", (override) => {
assert(alert_word_status.visible());
});
test_ui("close_status_message", (override) => {
run_test("close_status_message", (override) => {
override(alert_words_ui, "render_alert_words_ui", () => {});
alert_words_ui.set_up_alert_words();

19
frontend_tests/node_tests/buddy_list.js
View File

@@ -42,11 +42,6 @@ const alice = {
};
people.add_active_user(alice);
function test(label, f) {
// TODO: go back to run_test
run_test(label, f);
}
function populate_list_with_just_alice() {
// We don't make alice_li an actual jQuery stub,
// because our test only cares that it comes
@@ -61,13 +56,13 @@ function populate_list_with_just_alice() {
return alice_li;
}
test("get_items", () => {
run_test("get_items", () => {
const alice_li = populate_list_with_just_alice();
const items = buddy_list.get_items();
assert.deepEqual(items, [alice_li]);
});
test("basics", (override) => {
run_test("basics", (override) => {
init_simulated_scrolling();
override(buddy_list, "get_data_from_keys", (opts) => {
@@ -108,7 +103,7 @@ test("basics", (override) => {
assert.equal(li, alice_li);
});
test("big_list", (override) => {
run_test("big_list", (override) => {
const elem = init_simulated_scrolling();
// Don't actually render, but do simulate filling up
@@ -142,7 +137,7 @@ test("big_list", (override) => {
assert.equal(chunks_inserted, 6);
});
test("force_render", (override) => {
run_test("force_render", (override) => {
buddy_list.render_count = 50;
let num_rendered = 0;
@@ -163,7 +158,7 @@ test("force_render", (override) => {
});
});
test("find_li w/force_render", (override) => {
run_test("find_li w/force_render", (override) => {
// If we call find_li w/force_render set, and the
// key is not already rendered in DOM, then the
// widget will call show_key to force-render it.
@@ -199,7 +194,7 @@ test("find_li w/force_render", (override) => {
assert(shown);
});
test("find_li w/bad key", (override) => {
run_test("find_li w/bad key", (override) => {
override(buddy_list, "get_li_from_key", () => ({length: 0}));
const undefined_li = buddy_list.find_li({
@@ -210,7 +205,7 @@ test("find_li w/bad key", (override) => {
assert.deepEqual(undefined_li, []);
});
test("scrolling", (override) => {
run_test("scrolling", (override) => {
init_simulated_scrolling();
buddy_list.populate({

15
frontend_tests/node_tests/common.js
View File

@@ -12,17 +12,12 @@ set_global("document", {});
const common = zrequire("common");
function test_ui(label, f) {
// TODO: go back to run_test
run_test(label, f);
}
test_ui("basics", () => {
run_test("basics", () => {
common.autofocus("#home");
assert($("#home").is_focused());
});
test_ui("phrase_match", () => {
run_test("phrase_match", () => {
assert(common.phrase_match("tes", "test"));
assert(common.phrase_match("Tes", "test"));
assert(common.phrase_match("Tes", "Test"));
@@ -32,7 +27,7 @@ test_ui("phrase_match", () => {
assert(!common.phrase_match("tes", "hostess"));
});
test_ui("copy_data_attribute_value", (override) => {
run_test("copy_data_attribute_value", (override) => {
const admin_emails_val = "iago@zulip.com";
const input = $.create("input");
@@ -69,7 +64,7 @@ test_ui("copy_data_attribute_value", (override) => {
assert(faded_out);
});
test_ui("adjust_mac_shortcuts non-mac", () => {
run_test("adjust_mac_shortcuts non-mac", () => {
common.has_mac_keyboard = function () {
return false;
};
@@ -80,7 +75,7 @@ test_ui("adjust_mac_shortcuts non-mac", () => {
common.adjust_mac_shortcuts("selector-that-does-not-exist");
});
test_ui("adjust_mac_shortcuts mac", () => {
run_test("adjust_mac_shortcuts mac", () => {
const keys_to_test_mac = new Map([
["Backspace", "Delete"],
["Enter", "Return"],

21
frontend_tests/node_tests/compose_actions.js
View File

@@ -110,18 +110,13 @@ function assert_hidden(sel) {
assert(!$(sel).visible());
}
function test_ui(label, f) {
// TODO: go back to run_test
run_test(label, f);
}
test_ui("initial_state", () => {
run_test("initial_state", () => {
assert.equal(compose_state.composing(), false);
assert.equal(compose_state.get_message_type(), false);
assert.equal(compose_state.has_message_content(), false);
});
test_ui("start", () => {
run_test("start", () => {
compose_actions.autosize_message_content = noop;
compose_actions.expand_compose_box = noop;
compose_actions.set_focus = noop;
@@ -237,7 +232,7 @@ test_ui("start", () => {
assert(!compose_state.composing());
});
test_ui("respond_to_message", () => {
run_test("respond_to_message", () => {
// Test PM
const person = {
user_id: 22,
@@ -274,7 +269,7 @@ test_ui("respond_to_message", () => {
assert.equal($("#stream_message_recipient_stream").val(), "devel");
});
test_ui("reply_with_mention", (override) => {
run_test("reply_with_mention", (override) => {
const msg = {
type: "stream",
stream: "devel",
@@ -315,7 +310,7 @@ test_ui("reply_with_mention", (override) => {
assert.equal(syntax_to_insert, "@**Bob Roberts|40**");
});
test_ui("quote_and_reply", () => {
run_test("quote_and_reply", () => {
const msg = {
type: "stream",
stream: "devel",
@@ -397,7 +392,7 @@ test_ui("quote_and_reply", () => {
quote_and_reply(opts);
});
test_ui("get_focus_area", () => {
run_test("get_focus_area", () => {
assert.equal(get_focus_area("private", {}), "#private_message_recipient");
assert.equal(
get_focus_area("private", {
@@ -414,7 +409,7 @@ test_ui("get_focus_area", () => {
);
});
test_ui("focus_in_empty_compose", () => {
run_test("focus_in_empty_compose", () => {
$("#compose-textarea").is = function (attr) {
assert.equal(attr, ":focus");
return $("#compose-textarea").is_focused;
@@ -435,7 +430,7 @@ test_ui("focus_in_empty_compose", () => {
assert(!compose_state.focus_in_empty_compose());
});
test_ui("on_narrow", () => {
run_test("on_narrow", () => {
let cancel_called = false;
compose_actions.cancel = function () {
cancel_called = true;

23
frontend_tests/node_tests/pm_list.js
View File

@@ -55,12 +55,7 @@ people.add_active_user(me);
people.add_active_user(bot_test);
people.initialize_current_user(me.user_id);
function test(label, f) {
// TODO: go back to run_test
run_test(label, f);
}
test("close", () => {
run_test("close", () => {
let collapsed;
$("#private-container").empty = () => {
collapsed = true;
@@ -69,7 +64,7 @@ test("close", () => {
assert(collapsed);
});
test("build_private_messages_list", (override) => {
run_test("build_private_messages_list", (override) => {
const timestamp = 0;
pm_conversations.recent.insert([101, 102], timestamp);
@@ -112,7 +107,7 @@ test("build_private_messages_list", (override) => {
assert.deepEqual(pm_data, expected_data);
});
test("build_private_messages_list_bot", (override) => {
run_test("build_private_messages_list_bot", (override) => {
const timestamp = 0;
pm_conversations.recent.insert([314], timestamp);
@@ -154,7 +149,7 @@ test("build_private_messages_list_bot", (override) => {
assert.deepEqual(pm_data, expected_data);
});
test("update_dom_with_unread_counts", (override) => {
run_test("update_dom_with_unread_counts", (override) => {
let counts;
let toggle_button_set;
let expected_unread_count;
@@ -193,7 +188,7 @@ test("update_dom_with_unread_counts", (override) => {
assert(toggle_button_set);
});
test("get_active_user_ids_string", (override) => {
run_test("get_active_user_ids_string", (override) => {
let active_filter;
override(narrow_state, "filter", () => active_filter);
@@ -225,7 +220,7 @@ function private_filter() {
};
}
test("is_all_privates", (override) => {
run_test("is_all_privates", (override) => {
let filter;
override(narrow_state, "filter", () => filter);
@@ -236,7 +231,7 @@ test("is_all_privates", (override) => {
assert.equal(pm_list.is_all_privates(), true);
});
test("expand", (override) => {
run_test("expand", (override) => {
override(narrow_state, "filter", private_filter);
override(narrow_state, "active", () => true);
override(pm_list, "_build_private_messages_list", () => "PM_LIST_CONTENTS");
@@ -252,7 +247,7 @@ test("expand", (override) => {
assert($(".top_left_private_messages").hasClass("active-filter"));
});
test("update_private_messages", (override) => {
run_test("update_private_messages", (override) => {
let html_updated;
let container_found;
@@ -277,7 +272,7 @@ test("update_private_messages", (override) => {
assert(container_found);
});
test("ensure coverage", (override) => {
run_test("ensure coverage", (override) => {
// These aren't rigorous; they just cover cases
// where functions early exit.
override(narrow_state, "active", () => false);