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

notifications: Extract should_send_*_notification for testing.

Browse Source
This commit is contained in:
Tim Abbott
2019-12-10 12:54:08 -08:00
parent 016487163f
commit 22cefeede8
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
frontend_tests/node_tests/notifications.js
View File

@@ -11,12 +11,15 @@ set_global('document', {
set_global('page_params', {
is_admin: false,
realm_users: [],
enable_desktop_notifications: true,
enable_sounds: true,
});
const _navigator = {
userAgent: 'Mozilla/5.0 AppleWebKit/537.36 Chrome/64.0.3282.167 Safari/537.36',
};
set_global('navigator', _navigator);
zrequire('alert_words');
zrequire('muting');
zrequire('stream_data');
zrequire('people');
@@ -56,12 +59,16 @@ run_test('message_is_notifiable', () => {
content: 'message number 1',
sent_by_me: true,
notification_sent: false,
mentioned: true,
mentioned_me_directly: true,
type: 'stream',
stream: 'general',
stream_id: general.stream_id,
topic: 'whatever',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
// Not notifiable because it was sent by the current user
assert.equal(notifications.message_is_notifiable(message), false);
// Case 2: If the user has already been sent a notificaton about this message,
@@ -74,12 +81,15 @@ run_test('message_is_notifiable', () => {
content: 'message number 2',
sent_by_me: false,
notification_sent: true,
mentioned: true,
mentioned_me_directly: true,
type: 'stream',
stream: 'general',
stream_id: general.stream_id,
topic: 'whatever',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
assert.equal(notifications.message_is_notifiable(message), false);
// Case 3: If a message mentions the user directly,
@@ -90,12 +100,15 @@ run_test('message_is_notifiable', () => {
content: 'message number 3',
sent_by_me: false,
notification_sent: false,
mentioned: true,
mentioned_me_directly: true,
type: 'stream',
stream: 'muted',
stream_id: muted.stream_id,
topic: 'topic_three',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
assert.equal(notifications.message_is_notifiable(message), true);
// Case 4:
@@ -105,12 +118,15 @@ run_test('message_is_notifiable', () => {
content: 'message number 4',
sent_by_me: false,
notification_sent: false,
mentioned: true,
mentioned_me_directly: true,
type: 'stream',
stream: 'general',
stream_id: general.stream_id,
topic: 'vanilla',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
assert.equal(notifications.message_is_notifiable(message), true);
// Case 5: If a message is in a muted stream
@@ -121,12 +137,15 @@ run_test('message_is_notifiable', () => {
content: 'message number 5',
sent_by_me: false,
notification_sent: false,
mentioned: true,
mentioned_me_directly: false,
type: 'stream',
stream: 'muted',
stream_id: muted.stream_id,
topic: 'whatever',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
assert.equal(notifications.message_is_notifiable(message), false);
// Case 6: If a message is in a muted topic
@@ -137,12 +156,15 @@ run_test('message_is_notifiable', () => {
content: 'message number 6',
sent_by_me: false,
notification_sent: false,
mentioned: true,
mentioned_me_directly: false,
type: 'stream',
stream: 'general',
stream_id: general.stream_id,
topic: 'muted topic',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
assert.equal(notifications.message_is_notifiable(message), false);
// Case 7
@@ -155,12 +177,15 @@ run_test('message_is_notifiable', () => {
content: 'message number 7',
sent_by_me: false,
notification_sent: false,
mentioned: true,
mentioned_me_directly: false,
type: 'stream',
stream: 'general',
stream_id: general.stream_id,
topic: 'whatever',
};
assert.equal(notifications.should_send_desktop_notification(message), true);
assert.equal(notifications.should_send_audible_notification(message), true);
assert.equal(notifications.message_is_notifiable(message), true);
});

12
static/js/notifications.js
View File

@@ -490,7 +490,7 @@ exports.message_is_notifiable = function (message) {
return true;
};
function should_send_desktop_notification(message) {
exports.should_send_desktop_notification = function (message) {
// For streams, send if desktop notifications are enabled for this
// stream.
if (message.type === "stream" &&
@@ -518,9 +518,9 @@ function should_send_desktop_notification(message) {
}
return false;
}
};
function should_send_audible_notification(message) {
exports.should_send_audible_notification = function (message) {
// For streams, ding if sounds are enabled for this stream.
if (message.type === "stream" &&
stream_data.receives_notifications(message.stream, "audible_notifications")) {
@@ -542,7 +542,7 @@ function should_send_audible_notification(message) {
}
return false;
}
};
exports.granted_desktop_notifications_permission = function () {
return notifications_api &&
@@ -569,13 +569,13 @@ exports.received_messages = function (messages) {
message.notification_sent = true;
if (should_send_desktop_notification(message)) {
if (exports.should_send_desktop_notification(message)) {
process_notification({
message: message,
desktop_notify: exports.granted_desktop_notifications_permission(),
});
}
if (should_send_audible_notification(message) && supports_sound) {
if (exports.should_send_audible_notification(message) && supports_sound) {
$("#notifications-area").find("audio")[0].play();
}
});