Test that the spoiler button is hidden when OTR is active

spec/otr.js

@@ -4,7 +4,41 @@
     var Strophe = converse.env.Strophe;
     var b64_sha1 = converse.env.b64_sha1;
 
-    return describe("The OTR module", function() {
+    describe("A chatbox with an active OTR session", function() {
+
+        it("will not show the spoiler toolbar button",
+            mock.initConverseWithPromises(
+                null, ['rosterGroupsFetched'], {},
+                function (done, _converse) {
+
+            test_utils.createContacts(_converse, 'current');
+            var contact_jid = mock.cur_names[0].replace(/ /g,'.').toLowerCase() + '@localhost';
+            test_utils.openChatBoxFor(_converse, contact_jid);
+
+            var view = _converse.chatboxviews.get(contact_jid);
+            var spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
+            expect(spoiler_toggle).not.toBe(null);
+
+            view.model.set('otr_status', 0);
+            spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
+            expect(spoiler_toggle).not.toBe(null);
+
+            view.model.set('otr_status', 1);
+            spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
+            expect(spoiler_toggle).toBe(null);
+
+            view.model.set('otr_status', 2);
+            spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
+            expect(spoiler_toggle).toBe(null);
+
+            view.model.set('otr_status', 3);
+            spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
+            expect(spoiler_toggle).not.toBe(null);
+            done();
+        }));
+    });
+
+    describe("The OTR module", function() {
 
         it("will add processing hints to sent out encrypted <message> stanzas",
             mock.initConverseWithPromises(

spec/spoilers.js

@@ -99,7 +99,7 @@
             spyOn(view, 'onMessageSubmitted').and.callThrough();
             spyOn(_converse.connection, 'send');
 
-            var spoiler_toggle = view.el.querySelector('.toggle-spoiler-edit');
+            var spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
             spoiler_toggle.click();
 
             var textarea = view.el.querySelector('.chat-textarea');
@@ -159,7 +159,7 @@
 
             var view = _converse.chatboxviews.get(contact_jid);
 
-            var spoiler_toggle = view.el.querySelector('.toggle-spoiler-edit');
+            var spoiler_toggle = view.el.querySelector('.toggle-compose-spoiler');
             spoiler_toggle.click();
 
             spyOn(view, 'onMessageSubmitted').and.callThrough();

src/converse-chatview.js

@@ -278,7 +278,7 @@
                     'click .toggle-smiley ul.emoji-picker li': 'insertEmoji',
                     'click .toggle-smiley': 'toggleEmojiMenu',
                     'click .toggle-spoiler': 'toggleSpoilerMessage',
-                    'click .toggle-spoiler-edit': 'toggleComposeSpoilerMessage',
+                    'click .toggle-compose-spoiler': 'toggleComposeSpoilerMessage',
                     'keypress .chat-textarea': 'keyPressed'
                 },
 

src/converse-otr.js

@@ -458,7 +458,7 @@
 
                 getToolbarOptions (options) {
                     options = this.__super__.getToolbarOptions();
-                    if (this.model.get('composing_spoiler') && this.isOTREncryptedSession()) {
+                    if (this.isOTREncryptedSession()) {
                         options.show_spoiler_button = false;
                     }
                     return options;

src/templates/spoiler_button.html

 {[ if (o.show_spoiler_button)  { ]}
 <!-- XXX: This markup is also in src/templates/toolbar.html -->
-<li class="toggle-spoiler-edit">
+<li class="toggle-compose-spoiler">
     <a class="
         {[ if (o.sending_spoiler)  { ]} icon-eye-blocked {[ } ]}
         {[ if (!o.sending_spoiler)  { ]} icon-eye {[ } ]}"

src/templates/toolbar.html

@@ -4,7 +4,7 @@
 </li>
 {[ } ]}
 {[ if (o.show_spoiler_button)  { ]}
-<li class="toggle-spoiler-edit">
+<li class="toggle-compose-spoiler">
     <a class="
         {[ if (o.sending_spoiler)  { ]} icon-eye-blocked {[ } ]}
         {[ if (!o.sending_spoiler)  { ]} icon-eye {[ } ]}"