diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts index f1c3a5525..465dfb91a 100644 --- a/ts/session/sending/MessageQueue.ts +++ b/ts/session/sending/MessageQueue.ts @@ -21,7 +21,6 @@ import { PubKey } from '../types'; import { MessageSender } from '.'; import { MultiDeviceProtocol, SessionProtocol } from '../protocols'; import { UserUtil } from '../../util'; -import promise from 'redux-promise-middleware'; export class MessageQueue implements MessageQueueInterface { public readonly events: TypedEventEmitter; diff --git a/ts/test/session/sending/MessageQueue_test.ts b/ts/test/session/sending/MessageQueue_test.ts index 813ae20c6..c0d223ffc 100644 --- a/ts/test/session/sending/MessageQueue_test.ts +++ b/ts/test/session/sending/MessageQueue_test.ts @@ -161,7 +161,7 @@ describe('MessageQueue', () => { }); await expect(promise).to.be.fulfilled; } - }); + }).timeout(15000); describe('events', () => { it('should send a success event if message was sent', async () => { diff --git a/ts/test/session/sending/PendingMessageCache_test.ts b/ts/test/session/sending/PendingMessageCache_test.ts index dd6544364..128947bdb 100644 --- a/ts/test/session/sending/PendingMessageCache_test.ts +++ b/ts/test/session/sending/PendingMessageCache_test.ts @@ -109,11 +109,14 @@ describe('PendingMessageCache', () => { await pendingMessageCacheStub.add(device, message); await timeout(5); - await pendingMessageCacheStub.add( + const one = await pendingMessageCacheStub.add( device, TestUtils.generateChatMessage(message.identifier) ); - await pendingMessageCacheStub.add(TestUtils.generateFakePubKey(), message); + const two = await pendingMessageCacheStub.add( + TestUtils.generateFakePubKey(), + message + ); const initialCache = await pendingMessageCacheStub.getAllPending(); expect(initialCache).to.have.length(3); @@ -125,6 +128,7 @@ describe('PendingMessageCache', () => { // Verify that the message was removed expect(finalCache).to.have.length(2); + expect(finalCache).to.have.deep.members([one, two]); }); it('can get devices', async () => {