reactions.js: Extract open_reactions_popover().

Added tests for open_reactions_popover() also.
ghisvail · Sep 20, 2017 · d387291 · d387291
1 parent 67064a4
commit d387291
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 12 deletions.
diff --git a/frontend_tests/node_tests/hotkey.js b/frontend_tests/node_tests/hotkey.js
@@ -253,7 +253,7 @@ function stubbing(func_name_to_stub, test_function) {
     assert_mapping('u', 'popovers.show_sender_info');
     assert_mapping('v', 'lightbox.show_from_selected_message');
     assert_mapping('i', 'popovers.open_message_menu');
-    assert_mapping(':', 'emoji_picker.toggle_emoji_popover', true);
+    assert_mapping(':', 'reactions.open_reactions_popover', true);
     assert_mapping('G', 'navigate.to_end');
     assert_mapping('M', 'muting_ui.toggle_mute');
 

diff --git a/frontend_tests/node_tests/reactions.js b/frontend_tests/node_tests/reactions.js
@@ -83,6 +83,45 @@ set_global('message_store', {
     },
 });
 
+set_global('current_msg_list', {
+    selected_message: function () {
+        return { sent_by_me: true };
+    },
+    selected_row: function () {
+        return $('.selected-row');
+    },
+    selected_id: function () {
+        return 42;
+    },
+});
+
+(function test_open_reactions_popover() {
+    $('.selected-row').set_find_results('.actions_hover', $('.target-action'));
+    $('.selected-row').set_find_results('.reaction_button', $('.target-reaction'));
+
+    var called = false;
+    emoji_picker.toggle_emoji_popover = function (target, id) {
+        called = true;
+        assert.equal(id, 42);
+        assert.equal(target, $('.target-reaction')[0]);
+    };
+
+    assert(reactions.open_reactions_popover());
+    assert(called);
+
+    current_msg_list.selected_message = function () { return { sent_by_me: false }; };
+
+    called = false;
+    emoji_picker.toggle_emoji_popover = function (target, id) {
+        called = true;
+        assert.equal(id, 42);
+        assert.equal(target, $('.target-action')[0]);
+    };
+
+    assert(reactions.open_reactions_popover());
+    assert(called);
+}());
+
 (function test_basics() {
     var result = reactions.get_message_reactions(message);
 

diff --git a/static/js/hotkey.js b/static/js/hotkey.js
@@ -7,16 +7,6 @@ function do_narrow_action(action) {
     return true;
 }
 
-function open_reactions() {
-    var message = current_msg_list.selected_message();
-    var target = $(current_msg_list.selected_row()).find(".actions_hover")[0];
-    if (!message.sent_by_me) {
-        target = $(current_msg_list.selected_row()).find(".reaction_button")[0];
-    }
-    emoji_picker.toggle_emoji_popover(target, current_msg_list.selected_id());
-    return true;
-}
-
 var actions_dropdown_hotkeys = [
     'down_arrow',
     'up_arrow',
@@ -680,7 +670,7 @@ exports.process_hotkey = function (e, hotkey) {
             popovers.show_sender_info();
             return true;
         case 'open_reactions': // ':': open reactions to message
-            open_reactions();
+            reactions.open_reactions_popover();
             return true;
         case 'thumbs_up_emoji': // '+': reacts with thumbs up emoji on selected message
             reactions.toggle_emoji_reaction(msg.id, '+1');

diff --git a/static/js/reactions.js b/static/js/reactions.js
@@ -3,6 +3,16 @@ var exports = {};
 
 exports.view = {}; // function namespace
 
+exports.open_reactions_popover = function () {
+    var message = current_msg_list.selected_message();
+    var target = $(current_msg_list.selected_row()).find(".actions_hover")[0];
+    if (!message.sent_by_me) {
+        target = $(current_msg_list.selected_row()).find(".reaction_button")[0];
+    }
+    emoji_picker.toggle_emoji_popover(target, current_msg_list.selected_id());
+    return true;
+};
+
 function send_reaction_ajax(message_id, emoji_name, operation) {
     if (!emoji.emojis_by_name[emoji_name] && !emoji.active_realm_emojis[emoji_name]) {
         // Emoji doesn't exist