(TBR) fixed the tests and added the On message hook

conversejs · Jul 26, 2022 · bbb985e · bbb985e
1 parent 1140ad8
commit bbb985e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/headless/plugins/chat/model.js b/src/headless/plugins/chat/model.js
@@ -228,6 +228,7 @@ const ChatBox = ModelWithContact.extend({
                 !this.handleChatMarker(attrs) &&
                 !(await this.handleRetraction(attrs))
         ) {
+            const message_retraction = await api.hook('onMessage', this, { retract: false });
             this.setEditable(attrs, attrs.time);
 
             if (attrs['chat_state'] && attrs.sender === 'them') {

diff --git a/src/plugins/jingle/index.js b/src/plugins/jingle/index.js
@@ -10,7 +10,7 @@ import "./chat-header-notification.js";
 import './toolbar-button.js';
 import { JINGLE_CALL_STATUS } from './constants.js';
 import { html } from "lit";
-import { parseJingleMessage } from './utils.js';
+import { parseJingleMessage, handleRetraction } from './utils.js';
 
 const { Strophe } = converse.env;
 
@@ -47,5 +47,6 @@ converse.plugins.add('converse-jingle', {
            return buttons;
         });
         api.listen.on('parseMessage', parseJingleMessage);
+        api.listen.on('onMessage', handleRetraction);
     },
 });
diff --git a/src/plugins/jingle/tests/message-initiation.js b/src/plugins/jingle/tests/message-initiation.js
@@ -8,7 +8,7 @@ describe("A Jingle Message Initiation Request", function () {
 
     describe("from the initiator's perspective", function () {
 
-    fit("is sent out when one clicks the call button", mock.initConverse(
+    it("is sent out when one clicks the call button", mock.initConverse(
         ['chatBoxesFetched'], {}, async function (_converse) {
 
     await mock.waitForRoster(_converse, 'current', 1);
@@ -66,10 +66,8 @@ describe("A Jingle Message Initiation Request", function () {
     // This needs to be fixed
     expect(view.model.messages.length).toEqual(1);
     }));
-    });
 
-    //todo Add a test of the chat header
-    it("is ended when the initiator clicks the end call header button", mock.initConverse(
+    fit("is ended when the initiator clicks the end call header button", mock.initConverse(
         ['chatBoxesFetched'], {}, async function (_converse) {
 
     await mock.waitForRoster(_converse, 'current', 1);
@@ -79,7 +77,8 @@ describe("A Jingle Message Initiation Request", function () {
     // the first click starts the call, and the other one ends it
     const call_button = view.querySelector('converse-jingle-toolbar-button button');
     call_button.click();
-    call_button.click();
+    const header_end_call_button = await u.waitUntil(() => view.querySelector('.jingle-call-initiated-button'));
+    header_end_call_button.click();
     const sent_stanzas = _converse.connection.sent_stanzas;
     const stanza = await u.waitUntil(() => sent_stanzas.filter(s => sizzle(`retract[xmlns='${Strophe.NS.JINGLEMESSAGE}']`, s).length).pop());
     const retract_id = stanza.querySelector('retract');
@@ -104,7 +103,7 @@ describe("A Jingle Message Initiation Request", function () {
 
     describe("from the receiver's perspective", function () {
 
-        it("is received when the initiator clicks the call button", mock.initConverse(
+        fit("is received when the initiator clicks the call button", mock.initConverse(
             ['chatBoxesFetched'], { allow_non_roster_messaging: true }, async function (_converse) {
 
         await mock.waitForRoster(_converse, 'current', 1);
@@ -120,11 +119,10 @@ describe("A Jingle Message Initiation Request", function () {
                 </propose>
             <store xmlns='${Strophe.NS.HINTS}'/>
         </message>`);
-                _converse.connection._dataRecv(mock.createRequest(initiator_stanza));
+        _converse.connection._dataRecv(mock.createRequest(initiator_stanza));
 
-            const view = await u.waitUntil(() => _converse.chatboxviews.get(contact_jid));
-                expect(view.model.messages.length).toEqual(1);
-                const message = view.model.messages.at(0);
+        const view = await u.waitUntil(() => _converse.chatboxviews.get(contact_jid));
+        expect(view.model.messages.length).toEqual(1);
         }));
 
         it("is received when the initiator clicks the end call button", mock.initConverse(

diff --git a/src/plugins/jingle/utils.js b/src/plugins/jingle/utils.js
@@ -16,3 +16,7 @@ function getJingleProposeType(stanza){
 export function jingleCallInitialized() {
     JingleCallModal;
 }
+
+export function handleRetraction(context, retracted) {
+
+}