Refactor

ts/test/session/crypto/MessageEncrypter_test.ts

@@ -5,18 +5,18 @@ import * as sinon from 'sinon';
 import * as window from '../../../window';
 import { MessageEncrypter } from '../../../session/crypto';
 import { EncryptionType } from '../../../session/types/EncryptionType';
-import * as stubs from '../../utils/stubs';
-import { TestUtils } from '../../utils';
+import { Stubs } from '../../test-utils';
+import { UserUtil } from '../../../util';
 
 describe('MessageEncrypter', () => {
   const sandbox = sinon.createSandbox();
 
-  let sessionCipherStub: MockManager<stubs.SessionCipherBasicStub>;
+  let sessionCipherStub: MockManager<Stubs.SessionCipherBasicStub>;
   beforeEach(() => {
-    sessionCipherStub = ImportMock.mockClass(stubs, 'SessionCipherBasicStub');
+    sessionCipherStub = ImportMock.mockClass(Stubs, 'SessionCipherBasicStub');
     ImportMock.mockOther(window, 'libsignal', {
       SignalProtocolAddress: sandbox.stub(),
-      SessionCipher: stubs.SessionCipherBasicStub,
+      SessionCipher: Stubs.SessionCipherBasicStub,
     } as any);
 
     ImportMock.mockOther(window, 'textsecure', {
@@ -25,12 +25,7 @@ describe('MessageEncrypter', () => {
       },
     });
 
-    TestUtils.mockData('getItemById', undefined)
-      .withArgs('number_id')
-      .resolves({
-        id: 'number_id',
-        value: 'abc.1',
-      });
+    ImportMock.mockFunction(UserUtil, 'getCurrentDevicePubKey', '1');
   });
 
   afterEach(() => {

ts/test/session/utils/JobQueue_test.ts

@@ -1,7 +1,7 @@
 import chai from 'chai';
 import { v4 as uuid } from 'uuid';
 import { JobQueue } from '../../../session/utils/JobQueue';
-import { timeout } from '../../utils/timeout';
+import { timeout } from '../../test-utils';
 
 // tslint:disable-next-line: no-require-imports no-var-requires
 const chaiAsPromised = require('chai-as-promised');

ts/test/test-utils/index.ts

@@ -0,0 +1,5 @@
+import * as TestUtils from './testUtils';
+import * as Stubs from './stubs';
+export * from './timeout';
+
+export { TestUtils, Stubs };

ts/test/utils/index.ts

@@ -1,3 +0,0 @@
-import * as TestUtils from './testUtils';
-
-export { TestUtils };