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

channel: Simplify password change tracking.

Browse Source 
Move the password tracking variables from setup to channel module.
Track password_change requests in channel.
Directly use xhr object to store `password_changes` information.
Tests modified to accomodote this change by converting strings to
objects.
This commit is contained in:
Aman Agrawal
2021-10-05 06:31:45 +05:30
committed by Tim Abbott
parent 8433ce90dc
commit cc8cb5432e
4 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend_tests/node_tests/channel.js
View File

@@ -19,15 +19,6 @@ const xhr_401 = {
responseText: '{"msg": "Use cannnot access XYZ"}',
};
const xhr_password_changes = new WeakMap();
xhr_password_changes.set(xhr_401, 0);
const setup = mock_esm("../../static/js/setup", {
password_change_in_progress: false,
password_changes: 0,
xhr_password_changes,
});
let login_to_access_shown = false;
mock_esm("../../static/js/spectators", {
login_to_access: () => {
@@ -44,7 +35,7 @@ set_global("window", {
const reload_state = zrequire("reload_state");
const channel = zrequire("channel");
const default_stub_xhr = "default-stub-xhr";
const default_stub_xhr = {"default-stub-xhr": 0};
const $ = mock_jquery({});
@@ -176,7 +167,7 @@ test("normal_post", () => {
let orig_success_called;
let orig_error_called;
const stub_xhr = "stub-xhr-normal-post";
const stub_xhr = {"stub-xhr-normal-post": 0};
test_with_mock_ajax({
xhr: stub_xhr,
@@ -273,12 +264,12 @@ test("authentication_error_401_password_change_in_progress", () => {
// password_change_in_progress = true
check_ajax_options(options) {
page_params.is_spectator = true;
setup.password_change_in_progress = true;
channel.set_password_change_in_progress(true);
options.simulate_error();
assert.ok(!login_to_access_shown);
setup.password_change_in_progress = false;
channel.set_password_change_in_progress(false);
page_params.is_spectator = false;
login_to_access_shown = false;
},
@@ -372,7 +363,7 @@ test("retry", () => {
test("too_many_pending", () => {
channel.clear_for_tests();
$.ajax = () => {
const xhr = "stub";
const xhr = {stub: 0};
return xhr;
};