test: fixed broken mocking

Author: tegefaulkes

tests/identities/allowDisallowPermissions.test.ts

@@ -18,10 +18,8 @@ import { encodeProviderIdentityId } from '@matrixai/polykey/dist/identities/util
 import TestProvider from '../TestProvider';
 import * as testUtils from '../utils';
 
-// Fixes problem with spyOn overriding imports directly
-const mocks = {
-  browser: identitiesUtils.browser,
-};
+// @ts-ignore: stub out method
+identitiesUtils.browser = () => {};
 
 describe('allow/disallow/permissions', () => {
   const logger = new Logger('allow/disallow/permissions test', LogLevel.WARN, [
@@ -241,10 +239,6 @@ describe('allow/disallow/permissions', () => {
           cwd: dataDir,
         },
       );
-      // Authenticate our own identity in order to query the provider
-      const mockedBrowser = jest
-        .spyOn(mocks, 'browser')
-        .mockImplementation(() => {});
       await testUtils.pkStdio(
         [
           'identities',
@@ -260,7 +254,6 @@ describe('allow/disallow/permissions', () => {
           cwd: dataDir,
         },
       );
-      mockedBrowser.mockRestore();
       // Must first trust identity before we can set permissions
       // This is because trusting the identity sets it in our gestalt graph,
       // which we need in order to set permissions

tests/identities/authenticateAuthenticated.test.ts

@@ -13,10 +13,8 @@ import * as keysUtils from '@matrixai/polykey/dist/keys/utils/index';
 import TestProvider from '../TestProvider';
 import * as testUtils from '../utils';
 
-// Fixes problem with spyOn overriding imports directly
-const mocks = {
-  browser: identitiesUtils.browser,
-};
+// @ts-ignore: stub out method
+identitiesUtils.browser = () => {};
 
 describe('authenticate/authenticated', () => {
   const logger = new Logger('authenticate/authenticated test', LogLevel.WARN, [
@@ -66,9 +64,6 @@ describe('authenticate/authenticated', () => {
     async () => {
       // Can't test with target command due to mocking
       let exitCode, stdout;
-      const mockedBrowser = jest
-        .spyOn(mocks, 'browser')
-        .mockImplementation(() => {});
       // Authenticate an identity
       ({ exitCode, stdout } = await testUtils.pkStdio(
         [
@@ -126,7 +121,6 @@ describe('authenticate/authenticated', () => {
         providerId: testToken.providerId,
         identityId: testToken.identityId,
       });
-      mockedBrowser.mockRestore();
     },
   );
   testUtils.testIf(testUtils.isTestPlatformEmpty)(

tests/identities/claim.test.ts

@@ -14,10 +14,8 @@ import * as keysUtils from '@matrixai/polykey/dist/keys/utils/index';
 import TestProvider from '../TestProvider';
 import * as testUtils from '../utils';
 
-// Fixes problem with spyOn overriding imports directly
-const mocks = {
-  browser: identitiesUtils.browser,
-};
+// @ts-ignore: stub out method
+identitiesUtils.browser = () => {};
 
 describe('claim', () => {
   const logger = new Logger('claim test', LogLevel.WARN, [new StreamHandler()]);
@@ -64,9 +62,6 @@ describe('claim', () => {
     'claims an identity',
     async () => {
       // Need an authenticated identity
-      const mockedBrowser = jest
-        .spyOn(mocks, 'browser')
-        .mockImplementation(() => {});
       await testUtils.pkStdio(
         [
           'identities',
@@ -110,7 +105,6 @@ describe('claim', () => {
       expect(claim).toBeDefined();
       expect(claim!.id).toBe('0');
       // Expect(claim!.payload.data.type).toBe('identity');
-      mockedBrowser.mockRestore();
     },
   );
   testUtils.testIf(testUtils.isTestPlatformEmpty)(

tests/identities/discoverGet.test.ts

@@ -12,11 +12,15 @@ import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import PolykeyAgent from '@matrixai/polykey/dist/PolykeyAgent';
 import { sysexits } from '@matrixai/polykey/dist/utils';
 import * as nodesUtils from '@matrixai/polykey/dist/nodes/utils';
+import * as identitiesUtils from '@matrixai/polykey/dist/identities/utils';
 import * as keysUtils from '@matrixai/polykey/dist/keys/utils/index';
 import { encodeProviderIdentityId } from '@matrixai/polykey/dist/identities/utils';
 import TestProvider from '../TestProvider';
 import * as testUtils from '../utils';
 
+// @ts-ignore: stub out method
+identitiesUtils.browser = () => {};
+
 describe('discover/get', () => {
   const logger = new Logger('discover/get test', LogLevel.WARN, [
     new StreamHandler(),

tests/identities/search.test.ts

@@ -14,10 +14,8 @@ import * as keysUtils from '@matrixai/polykey/dist/keys/utils/index';
 import TestProvider from '../TestProvider';
 import * as testUtils from '../utils';
 
-// Fixes problem with spyOn overriding imports directly
-const mocks = {
-  browser: identitiesUtils.browser,
-};
+// @ts-ignore: stub out method
+identitiesUtils.browser = () => {};
 
 describe('search', () => {
   const logger = new Logger('search test', LogLevel.WARN, [
@@ -153,9 +151,6 @@ describe('search', () => {
       // Can't test with target executable due to mocking
       let exitCode, stdout;
       let searchResults: Array<IdentityData>;
-      const mockedBrowser = jest
-        .spyOn(mocks, 'browser')
-        .mockImplementation(() => {});
       // Search with no authenticated identities
       // Should return nothing
       ({ exitCode, stdout } = await testUtils.pkStdio(
@@ -344,7 +339,6 @@ describe('search', () => {
       expect(exitCode).toBe(0);
       searchResults = stdout.split('\n').slice(undefined, -1).map(JSON.parse);
       expect(searchResults).toHaveLength(2);
-      mockedBrowser.mockRestore();
     },
   );
   testUtils.testIf(testUtils.isTestPlatformEmpty)(

tests/identities/trustUntrustList.test.ts

@@ -18,10 +18,8 @@ import { encodeProviderIdentityId } from '@matrixai/polykey/dist/identities/util
 import TestProvider from '../TestProvider';
 import * as testUtils from '../utils';
 
-// Fixes problem with spyOn overriding imports directly
-const mocks = {
-  browser: identitiesUtils.browser,
-};
+// @ts-ignore: stub out method
+identitiesUtils.browser = () => {};
 
 describe('trust/untrust/list', () => {
   const logger = new Logger('trust/untrust/list test', LogLevel.WARN, [
@@ -130,9 +128,6 @@ describe('trust/untrust/list', () => {
           cwd: dataDir,
         },
       );
-      const mockedBrowser = jest
-        .spyOn(mocks, 'browser')
-        .mockImplementation(() => {});
       await testUtils.pkStdio(
         [
           'identities',
@@ -148,7 +143,6 @@ describe('trust/untrust/list', () => {
           cwd: dataDir,
         },
       );
-      mockedBrowser.mockRestore();
       // Trust node - this should trigger discovery on the gestalt the node
       // belongs to and add it to our gestalt graph
       ({ exitCode } = await testUtils.pkStdio(
@@ -264,9 +258,6 @@ describe('trust/untrust/list', () => {
           cwd: dataDir,
         },
       );
-      const mockedBrowser = jest
-        .spyOn(mocks, 'browser')
-        .mockImplementation(() => {});
       await testUtils.pkStdio(
         [
           'identities',
@@ -282,7 +273,6 @@ describe('trust/untrust/list', () => {
           cwd: dataDir,
         },
       );
-      mockedBrowser.mockRestore();
       // Trust identity - this should trigger discovery on the gestalt the node
       // belongs to and add it to our gestalt graph
       // This command should fail first time as we need to allow time for the

tests/sessions.test.ts

@@ -16,7 +16,7 @@ import * as testUtils from './utils';
 jest.mock('prompts');
 
 describe('sessions', () => {
-  const logger = new Logger('sessions test', LogLevel.DEBUG, [
+  const logger = new Logger('sessions test', LogLevel.WARN, [
     new StreamHandler(),
   ]);
   let agentDir;