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

node tests: Avoid rewiring client_is_active.

Browse Source
This commit is contained in:
Steve Howell
2021-05-18 19:29:06 +00:00
committed by Steve Howell
parent 7a3ba26c78
commit 7a9d0a505d
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
frontend_tests/node_tests/activity.js
View File

@@ -561,7 +561,7 @@ test_ui("initialize", (override) => {
scroll_handler_started = true;
};
activity.__Rewire__("client_is_active", false);
activity.mark_client_idle();
$(window).off("focus");
activity.initialize();
@@ -572,7 +572,8 @@ test_ui("initialize", (override) => {
assert(scroll_handler_started);
assert(!activity.new_user_input);
assert(!$("#zephyr-mirror-error").hasClass("show"));
assert(activity.client_is_active);
assert.equal(activity.compute_active_status(), "active");
$(window).idle = (params) => {
params.onIdle();
};
@@ -588,7 +589,7 @@ test_ui("initialize", (override) => {
assert($("#zephyr-mirror-error").hasClass("show"));
assert(!activity.new_user_input);
assert(!activity.client_is_active);
assert.equal(activity.compute_active_status(), "idle");
// Exercise the mousemove handler, which just
// sets a flag.
@@ -607,26 +608,31 @@ run_test("away_status", (override) => {
assert(!user_status.is_away(alice.user_id));
});
test_ui("electron_bridge", () => {
activity.__Rewire__("client_is_active", false);
test_ui("electron_bridge", (override) => {
override(activity, "send_presence_to_server", () => {});
activity.mark_client_idle();
window.electron_bridge = undefined;
assert.equal(activity.compute_active_status(), activity.IDLE);
activity.__Rewire__("client_is_active", true);
activity.mark_client_active();
assert.equal(activity.compute_active_status(), activity.ACTIVE);
window.electron_bridge = {
get_idle_on_system: () => true,
};
assert.equal(activity.compute_active_status(), activity.IDLE);
activity.__Rewire__("client_is_active", false);
activity.mark_client_idle();
window.electron_bridge = undefined;
assert.equal(activity.compute_active_status(), activity.IDLE);
window.electron_bridge = {
get_idle_on_system: () => false,
};
assert.equal(activity.compute_active_status(), activity.ACTIVE);
activity.__Rewire__("client_is_active", true);
activity.mark_client_active();
assert.equal(activity.compute_active_status(), activity.ACTIVE);
});

5
static/js/activity.js
View File

@@ -76,7 +76,7 @@ export function update_dom_with_unread_counts(counts) {
}
}
function mark_client_idle() {
export function mark_client_idle() {
// When we become idle, we don't immediately send anything to the
// server; instead, we wait for our next periodic update, since
// this data is fundamentally not timely.
@@ -210,7 +210,8 @@ export function send_presence_to_server(want_redraw) {
});
}
function mark_client_active() {
export function mark_client_active() {
// exported for testing
if (!client_is_active) {
client_is_active = true;
send_presence_to_server(false);