From c8b0627ffee405eaf4a2617cdf9e969f45ea4aa2 Mon Sep 17 00:00:00 2001
From: Rohitt Vashishtha <aero31aero@gmail.com>
Date: Mon, 20 Apr 2020 16:38:44 +0530
Subject: [PATCH] zblueslip: Run blueslip.reset after each test.

This simplifies the blueslip interface to just declaring expected
errors and calling the code to test.
---
 frontend_tests/node_tests/activity.js             |  1 -
 frontend_tests/node_tests/channel.js              |  3 ---
 frontend_tests/node_tests/compose.js              |  1 -
 frontend_tests/node_tests/emoji.js                |  1 -
 frontend_tests/node_tests/fold_dict.js            |  2 --
 frontend_tests/node_tests/hashchange.js           |  1 -
 frontend_tests/node_tests/input_pill.js           |  3 ---
 frontend_tests/node_tests/lazy_set.js             |  1 -
 frontend_tests/node_tests/list_cursor.js          |  2 --
 frontend_tests/node_tests/markdown.js             |  2 --
 frontend_tests/node_tests/message_store.js        |  4 ----
 frontend_tests/node_tests/muting.js               |  1 -
 frontend_tests/node_tests/people.js               |  4 ----
 frontend_tests/node_tests/people_errors.js        | 15 ---------------
 frontend_tests/node_tests/poll_widget.js          |  1 -
 frontend_tests/node_tests/presence.js             |  1 -
 frontend_tests/node_tests/reactions.js            |  7 -------
 frontend_tests/node_tests/scroll_util.js          |  2 --
 frontend_tests/node_tests/server_events.js        |  3 ---
 frontend_tests/node_tests/settings_user_groups.js |  1 -
 frontend_tests/node_tests/stream_data.js          |  3 ---
 frontend_tests/node_tests/topic_generator.js      |  1 -
 frontend_tests/node_tests/transmit.js             |  1 -
 frontend_tests/node_tests/user_events.js          |  1 -
 frontend_tests/node_tests/user_groups.js          |  3 ---
 frontend_tests/node_tests/widgetize.js            |  1 -
 frontend_tests/zjsunit/index.js                   |  2 ++
 27 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/frontend_tests/node_tests/activity.js b/frontend_tests/node_tests/activity.js
index 21b30a5d1c..4e03cdb8c0 100644
--- a/frontend_tests/node_tests/activity.js
+++ b/frontend_tests/node_tests/activity.js
@@ -159,7 +159,6 @@ run_test('get_status', () => {
 run_test('reload_defaults', () => {
     blueslip.expect('warn', 'get_filter_text() is called before initialization');
     assert.equal(activity.get_filter_text(), '');
-    blueslip.reset();
 });
 
 run_test('sort_users', () => {
diff --git a/frontend_tests/node_tests/channel.js b/frontend_tests/node_tests/channel.js
index 189d804b22..054cece63c 100644
--- a/frontend_tests/node_tests/channel.js
+++ b/frontend_tests/node_tests/channel.js
@@ -234,7 +234,6 @@ run_test('unexpected_403_response', () => {
         check_ajax_options: function (options) {
             blueslip.expect('error', 'Unexpected 403 response from server');
             options.simulate_error();
-            blueslip.reset();
         },
     });
 });
@@ -264,7 +263,6 @@ run_test('retry', () => {
                     assert.equal(options.data, 42);
                 },
             });
-            blueslip.reset();
         },
     });
 });
@@ -281,7 +279,6 @@ run_test('too_many_pending', () => {
     _.times(50, function () {
         channel.post({});
     });
-    blueslip.reset();
 });
 
 run_test('xhr_error_message', () => {
diff --git a/frontend_tests/node_tests/compose.js b/frontend_tests/node_tests/compose.js
index 5734b984c1..f183d7e2a4 100644
--- a/frontend_tests/node_tests/compose.js
+++ b/frontend_tests/node_tests/compose.js
@@ -1299,7 +1299,6 @@ run_test('on_events', () => {
         assert(!helper.container_was_removed());
         assert(!$("#compose_invite_users").visible());
         assert.equal($('#compose-error-msg').html(), "Stream no longer exists: no-stream");
-        blueslip.reset();
 
         // !sub will result in true here and we check the success code path.
         stream_data.add_sub(subscription);
diff --git a/frontend_tests/node_tests/emoji.js b/frontend_tests/node_tests/emoji.js
index b565c5ebf6..ebd47d61c1 100644
--- a/frontend_tests/node_tests/emoji.js
+++ b/frontend_tests/node_tests/emoji.js
@@ -46,7 +46,6 @@ run_test('get_canonical_name', () => {
 
     blueslip.expect('error', 'Invalid emoji name: non_existent');
     emoji.get_canonical_name('non_existent');
-    blueslip.reset();
 });
 
 function set_up_spain_realm_emoji_for_test() {
diff --git a/frontend_tests/node_tests/fold_dict.js b/frontend_tests/node_tests/fold_dict.js
index afc0bd2c60..1d8a540f1b 100644
--- a/frontend_tests/node_tests/fold_dict.js
+++ b/frontend_tests/node_tests/fold_dict.js
@@ -88,7 +88,5 @@ run_test('undefined_keys', () => {
 
     assert.equal(d.has(undefined), false);
     assert.strictEqual(d.get(undefined), undefined);
-
-    blueslip.reset();
 });
 
diff --git a/frontend_tests/node_tests/hashchange.js b/frontend_tests/node_tests/hashchange.js
index b71fdfc842..20f033612a 100644
--- a/frontend_tests/node_tests/hashchange.js
+++ b/frontend_tests/node_tests/hashchange.js
@@ -300,7 +300,6 @@ run_test('save_narrow', () => {
 
     blueslip.expect('warn', 'browser does not support pushState');
     hashchange.save_narrow(operators);
-    blueslip.reset();
 
     helper.assert_events([
         'message_viewport.stop_auto_scrolling',
diff --git a/frontend_tests/node_tests/input_pill.js b/frontend_tests/node_tests/input_pill.js
index de72ffbcd5..e7d38afeec 100644
--- a/frontend_tests/node_tests/input_pill.js
+++ b/frontend_tests/node_tests/input_pill.js
@@ -51,7 +51,6 @@ run_test('basics', () => {
 
     blueslip.expect('error', 'Pill needs container.');
     input_pill.create(config);
-    blueslip.reset();
 
     const pill_input = $.create('pill_input');
     const container = $.create('container');
@@ -60,12 +59,10 @@ run_test('basics', () => {
     blueslip.expect('error', 'Pill needs create_item_from_text');
     config.container = container;
     input_pill.create(config);
-    blueslip.reset();
 
     blueslip.expect('error', 'Pill needs get_text_from_item');
     config.create_item_from_text = noop;
     input_pill.create(config);
-    blueslip.reset();
 
     config.get_text_from_item = noop;
     const widget = input_pill.create(config);
diff --git a/frontend_tests/node_tests/lazy_set.js b/frontend_tests/node_tests/lazy_set.js
index 9b8e715ed4..552a748864 100644
--- a/frontend_tests/node_tests/lazy_set.js
+++ b/frontend_tests/node_tests/lazy_set.js
@@ -19,5 +19,4 @@ run_test('conversions', () => {
     const ls = new LazySet([1, 2]);
     ls.add('3');
     assert(ls.has('3'));
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/list_cursor.js b/frontend_tests/node_tests/list_cursor.js
index 2e7e319db7..3e61db2c34 100644
--- a/frontend_tests/node_tests/list_cursor.js
+++ b/frontend_tests/node_tests/list_cursor.js
@@ -43,7 +43,6 @@ run_test('misc errors', () => {
     blueslip.expect('error', 'Cannot highlight key for list_cursor: nada');
     cursor.go_to('nada');
 
-    blueslip.reset();
     cursor.prev();
     cursor.next();
 });
@@ -68,7 +67,6 @@ run_test('single item list', () => {
 
     // Test prev/next, which should just silently do nothing.
     // (Our basic_conf() has prev_key and next_key return undefined.)
-    blueslip.reset();
     cursor.prev();
     cursor.next();
 
diff --git a/frontend_tests/node_tests/markdown.js b/frontend_tests/node_tests/markdown.js
index cba92d3176..e66d3e5e99 100644
--- a/frontend_tests/node_tests/markdown.js
+++ b/frontend_tests/node_tests/markdown.js
@@ -583,7 +583,6 @@ run_test('python_to_js_filter', () => {
     actual_value = marked.InlineLexer.rules.zulip.realm_filters;
     expected_value = [];
     assert.deepEqual(actual_value, expected_value);
-    blueslip.reset();
 });
 
 run_test('katex_throws_unexpected_exceptions', () => {
@@ -591,7 +590,6 @@ run_test('katex_throws_unexpected_exceptions', () => {
     blueslip.expect('error', 'Error: some-exception');
     const message = { raw_content: '$$a$$' };
     markdown.apply_markdown(message);
-    blueslip.reset();
 });
 
 run_test('misc_helpers', () => {
diff --git a/frontend_tests/node_tests/message_store.js b/frontend_tests/node_tests/message_store.js
index 9009413a8d..3d8b227e42 100644
--- a/frontend_tests/node_tests/message_store.js
+++ b/frontend_tests/node_tests/message_store.js
@@ -101,7 +101,6 @@ run_test('add_message_metadata', () => {
 
     blueslip.expect('error', 'message_store got non-number: 2067');
     retrieved_message = message_store.get('2067');
-    blueslip.reset();
     assert.equal(retrieved_message, message);
 
     // access cached previous message, and test match subject/content
@@ -197,8 +196,6 @@ run_test('errors', () => {
     const names = message_store.get_pm_full_names(message);
     assert.equal(names, '?');
 
-    blueslip.reset();
-
     message = {
         type: 'stream',
         display_recipient: [{}],
@@ -304,5 +301,4 @@ run_test('message_id_change', () => {
 run_test('errors', () => {
     blueslip.expect('error', 'message_store.get got bad value: undefined');
     message_store.get(undefined);
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/muting.js b/frontend_tests/node_tests/muting.js
index 537d9a12b5..fdb1508475 100644
--- a/frontend_tests/node_tests/muting.js
+++ b/frontend_tests/node_tests/muting.js
@@ -77,7 +77,6 @@ run_test('get_and_set_muted_topics', () => {
     ];
     muting.initialize();
 
-    blueslip.reset();
 
     assert.deepEqual(muting.get_muted_topics().sort(), [
         [design.stream_id, 'typography'],
diff --git a/frontend_tests/node_tests/people.js b/frontend_tests/node_tests/people.js
index e05ea4499a..c2fc176dd2 100644
--- a/frontend_tests/node_tests/people.js
+++ b/frontend_tests/node_tests/people.js
@@ -155,7 +155,6 @@ run_test('basics', () => {
     // Invalid user ID returns false and warns.
     blueslip.expect('warn', 'Unexpectedly invalid user_id in user popover query: 123412');
     assert.equal(people.is_active_user_for_popover(123412), false);
-    blueslip.reset();
 
     // We can still get their info for non-realm needs.
     person = people.get_by_email(email);
@@ -807,7 +806,6 @@ run_test('updates', () => {
                     'FOO@example.com new email = bar@example.com');
     person = people.get_by_email(old_email);
     assert.equal(person.user_id, user_id);
-    blueslip.reset();
 });
 
 initialize();
@@ -912,7 +910,6 @@ run_test('track_duplicate_full_names', () => {
 
     blueslip.expect('warn', 'get_mention_syntax called without user_id.');
     assert.equal(people.get_mention_syntax('Stephen King'), '@**Stephen King**');
-    blueslip.reset();
     assert.equal(people.get_mention_syntax('Stephen King', 601), '@**Stephen King|601**');
     assert.equal(people.get_mention_syntax('Stephen King', 602), '@**Stephen King|602**');
     assert.equal(people.get_mention_syntax('Maria Athens', 603), '@**Maria Athens**');
@@ -1058,5 +1055,4 @@ run_test('emails_strings_to_user_ids_array', function () {
     blueslip.expect('warn', 'Unknown emails: dummyuser@example.com');
     user_ids = people.emails_strings_to_user_ids_array('dummyuser@example.com');
     assert.equal(user_ids, undefined);
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/people_errors.js b/frontend_tests/node_tests/people_errors.js
index 134460c6b4..4f6e2fd4fa 100644
--- a/frontend_tests/node_tests/people_errors.js
+++ b/frontend_tests/node_tests/people_errors.js
@@ -20,23 +20,18 @@ people.initialize_current_user(me.user_id);
 run_test('report_late_add', () => {
     blueslip.expect('error', 'Added user late: user_id=55 email=foo@example.com');
     people.report_late_add(55, 'foo@example.com');
-    blueslip.reset();
 
     blueslip.expect('log', 'Added user late: user_id=55 email=foo@example.com');
     reload_state.is_in_progress = return_true;
     people.report_late_add(55, 'foo@example.com');
-    blueslip.reset();
 });
 
 run_test('is_my_user_id', () => {
-    blueslip.reset();
     blueslip.expect('error', 'user_id is a string in my_user_id: 999');
     assert.equal(people.is_my_user_id('999'), false);
 
     blueslip.expect('error', 'user_id is a string in my_user_id: 30');
     assert.equal(people.is_my_user_id(me.user_id.toString()), true);
-
-    blueslip.reset();
 });
 
 run_test('blueslip', () => {
@@ -44,15 +39,12 @@ run_test('blueslip', () => {
 
     blueslip.expect('debug', 'User email operand unknown: ' + unknown_email);
     people.id_matches_email_operand(42, unknown_email);
-    blueslip.reset();
 
     blueslip.expect('error', 'Unknown user_id: 9999');
     people.get_actual_name_from_user_id(9999);
-    blueslip.reset();
 
     blueslip.expect('error', 'Unknown email for get_user_id: ' + unknown_email);
     people.get_user_id(unknown_email);
-    blueslip.reset();
 
     blueslip.expect('warn', 'No user_id provided for person@example.com');
     const person = {
@@ -61,20 +53,16 @@ run_test('blueslip', () => {
         full_name: 'Person Person',
     };
     people.add(person);
-    blueslip.reset();
 
     blueslip.expect('error', 'No user_id found for person@example.com');
     const user_id = people.get_user_id('person@example.com');
     assert.equal(user_id, undefined);
-    blueslip.reset();
 
     blueslip.expect('warn', 'Unknown user ids: 1,2');
     people.user_ids_string_to_emails_string('1,2');
-    blueslip.reset();
 
     blueslip.expect('warn', 'Unknown emails: ' + unknown_email);
     people.email_list_to_user_ids_string([unknown_email]);
-    blueslip.reset();
 
     let message = {
         type: 'private',
@@ -86,7 +74,6 @@ run_test('blueslip', () => {
     people.group_pm_with_user_ids(message);
     people.all_user_ids_in_pm(message);
     assert.equal(people.pm_perma_link(message), undefined);
-    blueslip.reset();
 
     const charles = {
         email: 'charles@example.com',
@@ -114,14 +101,12 @@ run_test('blueslip', () => {
     blueslip.expect('error', 'Unknown user id in message: 42');
     const reply_to = people.pm_reply_to(message);
     assert(reply_to.includes('?'));
-    blueslip.reset();
 
     people.pm_with_user_ids = function () { return [42]; };
     people.get_by_user_id = function () { return; };
     blueslip.expect('error', 'Unknown people in message');
     const uri = people.pm_with_url({});
     assert.equal(uri.indexOf('unk'), uri.length - 3);
-    blueslip.reset();
 
     blueslip.expect('error', 'Undefined field id');
     assert.equal(people.my_custom_profile_data(undefined), undefined);
diff --git a/frontend_tests/node_tests/poll_widget.js b/frontend_tests/node_tests/poll_widget.js
index 1f9f7eace9..bbbff29600 100644
--- a/frontend_tests/node_tests/poll_widget.js
+++ b/frontend_tests/node_tests/poll_widget.js
@@ -92,7 +92,6 @@ run_test('poll_data_holder my question', () => {
     blueslip.expect('warn', `unknown key for poll: ${invalid_vote_event.key}`);
     data_holder.handle_event(sender_id, invalid_vote_event);
     data = data_holder.get_widget_data();
-    blueslip.reset();
 
     const option_outbound_event = data_holder.handle.new_option.outbound('new option');
     assert.deepEqual(option_outbound_event, {
diff --git a/frontend_tests/node_tests/presence.js b/frontend_tests/node_tests/presence.js
index 6b989ca17c..7d932f756b 100644
--- a/frontend_tests/node_tests/presence.js
+++ b/frontend_tests/node_tests/presence.js
@@ -68,7 +68,6 @@ run_test('unknown user', () => {
 
     blueslip.expect('error', 'Unknown user ID in presence data: 999');
     presence.set_info(presences, now);
-    blueslip.reset();
 
     // If the server is suspected to be offline or reloading,
     // then we suppress errors.  The use case here is that we
diff --git a/frontend_tests/node_tests/reactions.js b/frontend_tests/node_tests/reactions.js
index b31eabc1c7..6b2efdf4a0 100644
--- a/frontend_tests/node_tests/reactions.js
+++ b/frontend_tests/node_tests/reactions.js
@@ -136,7 +136,6 @@ run_test('basics', () => {
     blueslip.expect('warn', 'Unknown user_id 8888 in reaction for message 1001');
     blueslip.expect('warn', 'Unknown user_id 9999 in reaction for message 1001');
     const result = reactions.get_message_reactions(message);
-    blueslip.reset();
     assert(reactions.current_user_has_reacted_to_emoji(message, 'unicode_emoji,263a'));
     assert(!reactions.current_user_has_reacted_to_emoji(message, 'bogus'));
 
@@ -209,7 +208,6 @@ run_test('sending', () => {
         blueslip.expect('warn', 'XHR Error Message.');
         global.channel.xhr_error_message = function () {return 'XHR Error Message.';};
         args.error();
-        blueslip.reset();
     });
     emoji_name = 'alien'; // not set yet
     global.with_stub(function (stub) {
@@ -257,7 +255,6 @@ run_test('sending', () => {
     emoji_name = 'unknown-emoji';   // Test sending an emoji unknown to frontend.
     blueslip.expect('warn', 'Bad emoji name: ' + emoji_name);
     reactions.toggle_emoji_reaction(message_id, emoji_name);
-    blueslip.reset();
     reactions.add_reaction = orig_add_reaction;
     reactions.remove_reaction = orig_remove_reaction;
 });
@@ -639,7 +636,6 @@ run_test('error_handling', () => {
     reactions.current_user_has_reacted_to_emoji = function () { return true; };
     reactions.toggle_emoji_reaction(55, bogus_event.emoji_name);
     reactions.current_user_has_reacted_to_emoji = original_func;
-    blueslip.reset();
 
     reactions.add_reaction(bogus_event);
 
@@ -763,7 +759,6 @@ run_test('duplicates', () => {
         ],
     };
 
-    blueslip.reset();
     blueslip.expect(
         'error',
         'server sent duplicate reactions for user 5 (key=unicode_emoji,263a)');
@@ -772,13 +767,11 @@ run_test('duplicates', () => {
 
 run_test('process_reaction_click errors', () => {
     global.message_store.get = () => undefined;
-    blueslip.reset();
     blueslip.expect('error', 'reactions: Bad message id: 55');
     blueslip.expect('error', 'message_id for reaction click is unknown: 55');
     reactions.process_reaction_click(55, 'whatever');
 
     global.message_store.get = () => message;
-    blueslip.reset();
     blueslip.expect('error', 'Data integrity problem for reaction bad-local-id (message some-msg-id)');
     reactions.process_reaction_click('some-msg-id', 'bad-local-id');
 });
diff --git a/frontend_tests/node_tests/scroll_util.js b/frontend_tests/node_tests/scroll_util.js
index 56e0524ee6..b04f182e60 100644
--- a/frontend_tests/node_tests/scroll_util.js
+++ b/frontend_tests/node_tests/scroll_util.js
@@ -110,6 +110,4 @@ run_test('get_list_scrolling_container error', () => {
     );
 
     scroll_util.get_list_scrolling_container(body);
-
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/server_events.js b/frontend_tests/node_tests/server_events.js
index 984bf26c15..b8cc7f56c4 100644
--- a/frontend_tests/node_tests/server_events.js
+++ b/frontend_tests/node_tests/server_events.js
@@ -112,7 +112,6 @@ run_test('event_dispatch_error', () => {
     assert.equal(logs[0].more_info.event.op, 'update');
     assert.equal(logs[0].more_info.event.id, 1);
     assert.equal(logs[0].more_info.other, undefined);
-    blueslip.reset();
 });
 
 run_test('event_new_message_error', () => {
@@ -130,7 +129,6 @@ run_test('event_new_message_error', () => {
     const logs = blueslip.get_test_logs('error');
     assert.equal(logs.length, 1);
     assert.equal(logs[0].more_info, undefined);
-    blueslip.reset();
 });
 
 run_test('event_edit_message_error', () => {
@@ -146,5 +144,4 @@ run_test('event_edit_message_error', () => {
     const logs = blueslip.get_test_logs('error');
     assert.equal(logs.length, 1);
     assert.equal(logs[0].more_info, undefined);
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/settings_user_groups.js b/frontend_tests/node_tests/settings_user_groups.js
index 8ddb3b1160..b0d0fb4149 100644
--- a/frontend_tests/node_tests/settings_user_groups.js
+++ b/frontend_tests/node_tests/settings_user_groups.js
@@ -320,7 +320,6 @@ run_test('populate_user_groups', () => {
     assert(user_groups_list_append_called);
     assert(get_by_user_id_called);
     assert(input_typeahead_called);
-    blueslip.reset();
     test_create_item(create_item_handler);
 
     // Tests for settings_user_groups.set_up workflow.
diff --git a/frontend_tests/node_tests/stream_data.js b/frontend_tests/node_tests/stream_data.js
index 046831118f..b8325d93af 100644
--- a/frontend_tests/node_tests/stream_data.js
+++ b/frontend_tests/node_tests/stream_data.js
@@ -310,7 +310,6 @@ run_test('subscribers', () => {
     blueslip.expect('error', 'We tried to add invalid subscriber: 9999999');
     ok = stream_data.add_subscriber('Rome', 9999999);
     assert(!ok);
-    blueslip.reset();
 });
 
 run_test('is_active', () => {
@@ -588,7 +587,6 @@ run_test('delete_sub', () => {
 
     blueslip.expect('warn', 'Failed to delete stream 99999');
     stream_data.delete_sub(99999);
-    blueslip.reset();
 });
 
 run_test('get_subscriber_count', () => {
@@ -601,7 +599,6 @@ run_test('get_subscriber_count', () => {
 
     blueslip.expect('warn', 'We got a get_subscriber_count count call for a non-existent stream.');
     assert.equal(stream_data.get_subscriber_count('India'), undefined);
-    blueslip.reset();
 
     stream_data.add_sub(india);
     assert.equal(stream_data.get_subscriber_count('India'), 0);
diff --git a/frontend_tests/node_tests/topic_generator.js b/frontend_tests/node_tests/topic_generator.js
index 4c1e6ae0b6..70e4b02198 100644
--- a/frontend_tests/node_tests/topic_generator.js
+++ b/frontend_tests/node_tests/topic_generator.js
@@ -180,7 +180,6 @@ run_test('fchain', () => {
     ints = tg.list_generator([29, 43]);
     gen = tg.fchain(ints, undef);
     gen.next();
-    blueslip.reset();
 });
 
 run_test('streams', () => {
diff --git a/frontend_tests/node_tests/transmit.js b/frontend_tests/node_tests/transmit.js
index 02ccc04c31..24ea13c17d 100644
--- a/frontend_tests/node_tests/transmit.js
+++ b/frontend_tests/node_tests/transmit.js
@@ -184,5 +184,4 @@ run_test('reply_message_errors', () => {
         message: bogus_message,
     });
 
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/user_events.js b/frontend_tests/node_tests/user_events.js
index 0addd02e0f..76cc72b512 100644
--- a/frontend_tests/node_tests/user_events.js
+++ b/frontend_tests/node_tests/user_events.js
@@ -151,7 +151,6 @@ run_test('updates', () => {
     blueslip.expect('error', 'Got update_person event for unexpected user 29');
     blueslip.expect('error', 'Unknown user_id in get_by_user_id: 29');
     assert(!user_events.update_person({user_id: 29, full_name: 'Sir Isaac Newton'}));
-    blueslip.reset();
 
     me.profile_data = {};
     user_events.update_person({user_id: me.user_id, custom_profile_field: {id: 3, value: 'Value', rendered_value: '<p>Value</p>'}});
diff --git a/frontend_tests/node_tests/user_groups.js b/frontend_tests/node_tests/user_groups.js
index a3a40f1247..452b37e932 100644
--- a/frontend_tests/node_tests/user_groups.js
+++ b/frontend_tests/node_tests/user_groups.js
@@ -49,13 +49,11 @@ run_test('user_groups', () => {
 
     blueslip.expect('error', 'Unknown group_id in get_user_group_from_id: ' + all.id);
     assert.equal(user_groups.get_user_group_from_id(all.id), undefined);
-    blueslip.reset();
 
     user_groups.remove(students);
 
     blueslip.expect('error', 'Unknown group_id in get_user_group_from_id: ' + students.id);
     assert.equal(user_groups.get_user_group_from_id(students.id), undefined);
-    blueslip.reset();
 
     assert.equal(user_groups.get_user_group_from_name(all.name), undefined);
     assert.equal(user_groups.get_user_group_from_name(admins.name).id, 1);
@@ -89,5 +87,4 @@ run_test('user_groups', () => {
 
     blueslip.expect('error', 'Could not find user group with ID -1');
     assert.equal(user_groups.is_member_of(-1, 15), false);
-    blueslip.reset();
 });
diff --git a/frontend_tests/node_tests/widgetize.js b/frontend_tests/node_tests/widgetize.js
index 6e1bca4661..8200e278b6 100644
--- a/frontend_tests/node_tests/widgetize.js
+++ b/frontend_tests/node_tests/widgetize.js
@@ -136,7 +136,6 @@ run_test('activate', () => {
     assert(!is_widget_activated);
     assert(!is_event_handled);
     assert.equal(blueslip.get_test_logs('warn')[0].more_info, 'invalid_widget');
-    blueslip.reset();
 
     /* Testing widgetize.handle_events */
     const post_activate_event = {
diff --git a/frontend_tests/zjsunit/index.js b/frontend_tests/zjsunit/index.js
index 02054682ce..38bdfa338f 100644
--- a/frontend_tests/zjsunit/index.js
+++ b/frontend_tests/zjsunit/index.js
@@ -101,6 +101,8 @@ global.run_test = (label, f) => {
         console.info('        test: ' + label);
     }
     f();
+    // defensively reset blueslip after each test.
+    blueslip.reset();
 };
 
 try {