CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-03 21:10:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

node_tests: Replace override(blueslip) with blueslip.expect.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-03-16 15:55:01 -07:00 committed by Steve Howell
parent 039dd256a1
commit b0ceaa1ea0
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend_tests/node_tests/dispatch_subs.js
View File

@ -129,15 +129,13 @@ test("update", (override) => {
assert.deepEqual(args.value, event.value);
});
test("add error handling", (override) => {
test("add error handling", () => {
// test blueslip errors/warns
const event = event_fixtures.subscription__add;
const stub = make_stub();
override(blueslip, "error", stub.f);
blueslip.expect("error", "Subscribing to unknown stream with ID 101");
dispatch(event);
assert.equal(stub.num_calls, 1);
assert.deepEqual(stub.get_args("param").param, "Subscribing to unknown stream with ID 101");
blueslip.reset();
});
test("peer event error handling (bad stream_ids/user_ids)", (override) => {

27
frontend_tests/node_tests/stream_events.js
View File

@ -96,16 +96,13 @@ test("update_property", (override) => {
// Invoke error for non-existent stream/property
{
let errors = 0;
override(blueslip, "warn", () => {
errors += 1;
});
blueslip.expect("warn", "Update for an unknown subscription");
stream_events.update_property(99, "color", "blue");
assert.equal(errors, 1);
blueslip.reset();
blueslip.expect("warn", "Unexpected subscription property type");
stream_events.update_property(stream_id, "not_real", 42);
assert.equal(errors, 2);
blueslip.reset();
}
// Test update color
@ -255,14 +252,11 @@ test("marked_(un)subscribed (early return)", () => {
stream_events.mark_unsubscribed({subscribed: false});
});
test("marked_subscribed (error)", (override) => {
test("marked_subscribed (error)", () => {
// Test undefined error
let errors = 0;
override(blueslip, "error", () => {
errors += 1;
});
blueslip.expect("error", "Undefined sub passed to mark_subscribed");
stream_events.mark_subscribed(undefined, [], "yellow");
assert.equal(errors, 1);
blueslip.reset();
});
test("marked_subscribed (normal)", (override) => {
@ -319,21 +313,18 @@ test("marked_subscribed (color)", (override) => {
};
override(color_data, "pick_color", () => "green");
let warnings = 0;
override(blueslip, "warn", () => {
warnings += 1;
});
// narrow state is undefined
{
const stub = make_stub();
override(subs, "set_color", stub.f);
blueslip.expect("warn", "Frontend needed to pick a color in mark_subscribed");
stream_events.mark_subscribed(sub, [], undefined);
assert.equal(stub.num_calls, 1);
const args = stub.get_args("id", "color");
assert.equal(args.id, sub.stream_id);
assert.equal(args.color, "green");
assert.equal(warnings, 1);
blueslip.reset();
}
});