improve sendToGroup

ts/session/sending/index.ts

@@ -2,5 +2,6 @@
 import * as MessageSender from './MessageSender';
 export { MessageSender };
 
+export * from './PendingMessageCache';
 export * from './MessageQueue';
 export * from './MessageQueueInterface';

ts/session/types/index.ts

@@ -1,3 +1,4 @@
 export * from './EncryptionType';
 export * from './RawMessage';
 export * from './PubKey';
+export * from './OpenGroup';

ts/test/session/messages/OpenGroupMessage_test.ts

@@ -5,7 +5,7 @@ import {
   OpenGroupMessage,
 } from '../../../session/messages/outgoing';
 import * as MIME from '../../../../ts/types/MIME';
-import { OpenGroup } from '../../../session/types/OpenGroup';
+import { OpenGroup } from '../../../session/types';
 
 describe('OpenGroupMessage', () => {
   const group = new OpenGroup({

ts/test/session/sending/MessageQueue_test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
-import Sinon, * as sinon from 'sinon';
+import * as sinon from 'sinon';
-import { GroupUtils, SyncMessageUtils } from '../../../session/utils';
+import { GroupUtils } from '../../../session/utils';
 import { Stubs, TestUtils } from '../../../test/test-utils';
 import { MessageQueue } from '../../../session/sending/MessageQueue';
 import {
@@ -11,14 +11,9 @@ import {
 } from '../../../session/messages/outgoing';
 import { PubKey, RawMessage } from '../../../session/types';
 import { UserUtil } from '../../../util';
-import { MessageSender } from '../../../session/sending';
+import { MessageSender, PendingMessageCache } from '../../../session/sending';
 import { toRawMessage } from '../../../session/utils/Messages';
 import { SessionProtocol } from '../../../session/protocols';
-import { PendingMessageCache } from '../../../session/sending/PendingMessageCache';
-import {
-  generateChatMessage,
-  generateFakePubkey,
-} from '../../test-utils/testUtils';
 
 // Equivalent to Data.StorageItem
 interface StorageItem {
@@ -46,6 +41,10 @@ describe('MessageQueue', () => {
     [ContentMessage, Array<PubKey>],
     Promise<Array<void>>
   >;
+  let sendToGroupSpy: sinon.SinonSpy<
+    [ContentMessage | OpenGroupMessage],
+    Promise<boolean>
+  >;
 
   // Message Sender Stubs
   let sendStub: sinon.SinonStub<[RawMessage, (number | undefined)?]>;
@@ -140,6 +139,7 @@ describe('MessageQueue', () => {
       MessageQueue.prototype,
       'sendMessageToDevices'
     );
+    sendToGroupSpy = sandbox.spy(MessageQueue.prototype, 'sendToGroup');
 
     // Init Queue
     messageQueueStub = new MessageQueue();
@@ -182,8 +182,8 @@ describe('MessageQueue', () => {
     });
 
     it('will send message if session exists', async () => {
-      const device = generateFakePubkey();
+      const device = TestUtils.generateFakePubkey();
-      const hasSession = hasSessionStub(device);
+      const hasSession = await hasSessionStub(device);
 
       const promise = messageQueueStub.processPending(device);
       expect(promise).to.be.fulfilled;
@@ -312,7 +312,13 @@ describe('MessageQueue', () => {
       const message = TestUtils.generateClosedGroupMessage('invalid-group-id');
       const success = await messageQueueStub.sendToGroup(message);
 
-      expect(message instanceof ClosedGroupMessage).to.equal(
+      // Ensure message parameter passed into sendToGroup is as expected
+      await tick();
+      expect(sendToGroupSpy.callCount).to.equal(1);
+      expect(sendToGroupSpy.lastCall.args).to.have.length(1);
+
+      const argsMessage = sendToGroupSpy.lastCall.args[0];
+      expect(argsMessage instanceof ClosedGroupMessage).to.equal(
         true,
         'message passed into sendToGroup was not a ClosedGroupMessage'
       );
@@ -362,7 +368,7 @@ describe('MessageQueue', () => {
       const successSpy = sandbox.spy();
       messageQueueStub.events.on('success', successSpy);
 
-      const device = generateFakePubkey();
+      const device = TestUtils.generateFakePubkey();
       const promise = messageQueueStub.processPending(device);
       expect(promise).to.be.fulfilled;
 
@@ -376,7 +382,7 @@ describe('MessageQueue', () => {
       const failureSpy = sandbox.spy();
       messageQueueStub.events.on('fail', failureSpy);
 
-      const device = generateFakePubkey();
+      const device = TestUtils.generateFakePubkey();
       const promise = messageQueueStub.processPending(device);
       expect(promise).to.be.fulfilled;