From d5c4108ed64ca96a9e4a96b699fe5cea7be7e1c7 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 22 Feb 2021 13:29:33 +1100
Subject: [PATCH] fix tests

---
 test/models/messages_test.js                  | 37 +++++++++++++++----
 .../session/unit/sending/MessageQueue_test.ts |  4 --
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/test/models/messages_test.js b/test/models/messages_test.js
index 3add5067d..49c43c036 100644
--- a/test/models/messages_test.js
+++ b/test/models/messages_test.js
@@ -33,6 +33,7 @@ describe('MessageCollection', () => {
     const message = messages.add({
       type: 'incoming',
       source,
+      conversationId: 'conversationId',
     });
     message.getContact();
   });
@@ -45,8 +46,8 @@ describe('MessageCollection', () => {
     tomorrow.setDate(today.getDate() + 1);
 
     // Add threads
-    messages.add({ received_at: today });
-    messages.add({ received_at: tomorrow });
+    messages.add({ received_at: today, conversationId: 'conversationId' });
+    messages.add({ received_at: tomorrow, conversationId: 'conversationId' });
 
     const { models } = messages;
     const firstTimestamp = models[0].get('received_at').getTime();
@@ -60,7 +61,10 @@ describe('MessageCollection', () => {
     const messages = new window.models.Message.MessageCollection();
     let message = messages.add(attributes);
     assert.notOk(message.isIncoming());
-    message = messages.add({ type: 'incoming' });
+    message = messages.add({
+      type: 'incoming',
+      conversationId: 'conversationId',
+    });
     assert.ok(message.isIncoming());
   });
 
@@ -68,7 +72,10 @@ describe('MessageCollection', () => {
     const messages = new window.models.Message.MessageCollection();
     let message = messages.add(attributes);
     assert.ok(message.isOutgoing());
-    message = messages.add({ type: 'incoming' });
+    message = messages.add({
+      type: 'incoming',
+      conversationId: 'conversationId',
+    });
     assert.notOk(message.isOutgoing());
   });
 
@@ -77,7 +84,10 @@ describe('MessageCollection', () => {
     let message = messages.add(attributes);
     assert.notOk(message.isGroupUpdate());
 
-    message = messages.add({ group_update: true });
+    message = messages.add({
+      group_update: true,
+      conversationId: 'conversationId',
+    });
     assert.ok(message.isGroupUpdate());
   });
 
@@ -91,21 +101,30 @@ describe('MessageCollection', () => {
       'If no group updates or end session flags, return message body.'
     );
 
-    message = messages.add({ group_update: { left: 'Alice' } });
+    message = messages.add({
+      group_update: { left: 'Alice' },
+      conversationId: 'conversationId',
+    });
     assert.equal(
       message.getDescription(),
       'Alice has left the group.',
       'Notes one person leaving the group.'
     );
 
-    message = messages.add({ group_update: { name: 'blerg' } });
+    message = messages.add({
+      group_update: { name: 'blerg' },
+      conversationId: 'conversationId',
+    });
     assert.equal(
       message.getDescription(),
       "Group name is now 'blerg'.",
       'Returns a single notice if only group_updates.name changes.'
     );
 
-    message = messages.add({ group_update: { joined: ['Bob'] } });
+    message = messages.add({
+      group_update: { joined: ['Bob'] },
+      conversationId: 'conversationId',
+    });
     assert.equal(
       message.getDescription(),
       'Bob joined the group.',
@@ -114,6 +133,7 @@ describe('MessageCollection', () => {
 
     message = messages.add({
       group_update: { joined: ['Bob', 'Alice', 'Eve'] },
+      conversationId: 'conversationId',
     });
     assert.equal(
       message.getDescription(),
@@ -123,6 +143,7 @@ describe('MessageCollection', () => {
 
     message = messages.add({
       group_update: { joined: ['Bob'], name: 'blerg' },
+      conversationId: 'conversationId',
     });
     assert.equal(
       message.getDescription(),
diff --git a/ts/test/session/unit/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts
index 695616f77..d018490e9 100644
--- a/ts/test/session/unit/sending/MessageQueue_test.ts
+++ b/ts/test/session/unit/sending/MessageQueue_test.ts
@@ -232,10 +232,6 @@ describe('MessageQueue', () => {
 
           const message = TestUtils.generateOpenGroupMessage();
           await messageQueueStub.sendToOpenGroup(message);
-          expect(messageSentHandlerSuccessStub.callCount).to.equal(1);
-          expect(
-            messageSentHandlerSuccessStub.lastCall.args[0].identifier
-          ).to.equal(message.identifier);
           expect(messageSentPublicHandlerSuccessStub.callCount).to.equal(1);
           expect(
             messageSentPublicHandlerSuccessStub.lastCall.args[0].identifier