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

refactor: Remove current_date arg from last_seen_status_from_date.

Browse Source 
The current_date argument was only used in tests and now we're using
and now we're using MockDate in tests.
This commit is contained in:
Shubham Padia
2024-01-15 14:01:32 +07:00
committed by Tim Abbott
parent d5de26ff3b
commit 3d2110be51
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/timerender.ts
View File

@@ -256,10 +256,8 @@ export function relative_time_string_from_date(date: Date): string {
// word order. // word order.
// //
// Current date is passed as an argument for unit testing // Current date is passed as an argument for unit testing
export function last_seen_status_from_date( export function last_seen_status_from_date(last_active_date: Date): string {
last_active_date: Date, const current_date = new Date();
current_date = new Date(),
): string {
const minutes = differenceInMinutes(current_date, last_active_date); const minutes = differenceInMinutes(current_date, last_active_date);
if (minutes < 60) { if (minutes < 60) {
return $t({defaultMessage: "Active {minutes} minutes ago"}, {minutes}); return $t({defaultMessage: "Active {minutes} minutes ago"}, {minutes});

5
web/tests/timerender.test.js
View File

@@ -482,6 +482,7 @@ run_test("get_full_datetime", () => {
run_test("last_seen_status_from_date", () => { run_test("last_seen_status_from_date", () => {
// Set base_date to March 1 2016 12.30 AM (months are zero based) // Set base_date to March 1 2016 12.30 AM (months are zero based)
let base_date = new Date(2016, 2, 1, 0, 30); let base_date = new Date(2016, 2, 1, 0, 30);
MockDate.set(base_date.getTime());
function assert_same(duration, expected_status) { function assert_same(duration, expected_status) {
const past_date = add(base_date, duration); const past_date = add(base_date, duration);
@@ -513,11 +514,13 @@ run_test("last_seen_status_from_date", () => {
// Set base_date to May 1 2016 12.30 AM (months are zero based) // Set base_date to May 1 2016 12.30 AM (months are zero based)
base_date = new Date(2016, 4, 1, 0, 30); base_date = new Date(2016, 4, 1, 0, 30);
MockDate.set(base_date.getTime());
assert_same({days: -91}, $t({defaultMessage: "Active Jan 31"})); assert_same({days: -91}, $t({defaultMessage: "Active Jan 31"}));
// Set base_date to May 1 2016 10.30 PM (months are zero based) // Set base_date to May 1 2016 10.30 PM (months are zero based)
base_date = new Date(2016, 4, 2, 23, 30); base_date = new Date(2016, 4, 2, 23, 30);
MockDate.set(base_date.getTime());
assert_same({hours: -1}, $t({defaultMessage: "Active an hour ago"})); assert_same({hours: -1}, $t({defaultMessage: "Active an hour ago"}));
@@ -526,6 +529,8 @@ run_test("last_seen_status_from_date", () => {
assert_same({hours: -12}, $t({defaultMessage: "Active 12 hours ago"})); assert_same({hours: -12}, $t({defaultMessage: "Active 12 hours ago"}));
assert_same({hours: -24}, $t({defaultMessage: "Active yesterday"})); assert_same({hours: -24}, $t({defaultMessage: "Active yesterday"}));
MockDate.reset();
}); });
run_test("relative_time_string_from_date", () => { run_test("relative_time_string_from_date", () => {