Merge pull request #437 from MatrixAI/feature-conditional_testing_fix

Standardise conditional testing fix
MatrixAI · Aug 8, 2022 · 94ec1d2 · 94ec1d2
2 parents 3c206c5 + 8ae818b
commit 94ec1d2
Show file tree

Hide file tree

Showing 62 changed files with 2,544 additions and 2,406 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -28,6 +28,13 @@
     "no-constant-condition": 0,
     "no-useless-escape": 0,
     "no-console": "error",
+    "no-restricted-globals": [
+      "error",
+      {
+        "name": "global",
+        "message": "Use `globalThis` instead"
+      }
+    ],
     "require-yield": 0,
     "eqeqeq": ["error", "smart"],
     "spaced-comment": [

diff --git a/tests/agent/GRPCClientAgent.test.ts b/tests/agent/GRPCClientAgent.test.ts
@@ -168,7 +168,7 @@ describe(GRPCClientAgent.name, () => {
       serverHost: host,
       serverPort: port,
     });
-  }, global.defaultTimeout);
+  }, globalThis.defaultTimeout);
   afterEach(async () => {
     await testAgentUtils.closeTestAgentClient(client);
     await testAgentUtils.closeTestAgentServer(server);

diff --git a/tests/agent/service/nodesChainDataGet.test.ts b/tests/agent/service/nodesChainDataGet.test.ts
@@ -61,7 +61,7 @@ describe('nodesClosestLocalNode', () => {
       port: grpcServer.getPort(),
       logger,
     });
-  }, global.defaultTimeout);
+  }, globalThis.defaultTimeout);
   afterEach(async () => {
     await grpcClient.destroy();
     await grpcServer.stop();

diff --git a/tests/agent/service/nodesClosestLocalNode.test.ts b/tests/agent/service/nodesClosestLocalNode.test.ts
@@ -61,7 +61,7 @@ describe('nodesChainDataGet', () => {
       port: grpcServer.getPort(),
       logger,
     });
-  }, global.defaultTimeout);
+  }, globalThis.defaultTimeout);
   afterEach(async () => {
     await grpcClient.destroy();
     await grpcServer.stop();

diff --git a/tests/agent/service/nodesCrossSignClaim.test.ts b/tests/agent/service/nodesCrossSignClaim.test.ts
@@ -84,7 +84,7 @@ describe('nodesCrossSignClaim', () => {
       port: grpcServer.getPort(),
       logger,
     });
-  }, global.defaultTimeout);
+  }, globalThis.defaultTimeout);
   afterEach(async () => {
     await grpcClient.destroy();
     await grpcServer.stop();

diff --git a/tests/agent/service/nodesHolePunchMessage.test.ts b/tests/agent/service/nodesHolePunchMessage.test.ts
@@ -61,7 +61,7 @@ describe('nodesHolePunchMessage', () => {
       port: grpcServer.getPort(),
       logger,
     });
-  }, global.defaultTimeout);
+  }, globalThis.defaultTimeout);
   afterEach(async () => {
     await grpcClient.destroy();
     await grpcServer.stop();

diff --git a/tests/agent/service/notificationsSend.test.ts b/tests/agent/service/notificationsSend.test.ts
@@ -155,7 +155,7 @@ describe('notificationsSend', () => {
       port: grpcServer.getPort(),
       logger,
     });
-  }, global.defaultTimeout);
+  }, globalThis.defaultTimeout);
   afterEach(async () => {
     await grpcClient.destroy();
     await grpcServer.stop();

diff --git a/tests/bin/agent/lock.test.ts b/tests/bin/agent/lock.test.ts
@@ -6,7 +6,7 @@ import Logger, { LogLevel, StreamHandler } from '@matrixai/logger';
 import Session from '@/sessions/Session';
 import config from '@/config';
 import * as execUtils from '../../utils/exec';
-import { runTestIfPlatforms } from '../../utils';
+import * as testUtils from '../../utils';
 import { globalRootKeyPems } from '../../fixtures/globalRootKeyPems';
 
 jest.mock('prompts');
@@ -26,7 +26,9 @@ describe('lock', () => {
   afterEach(async () => {
     await agentClose();
   });
-  runTestIfPlatforms('docker')('lock deletes the session token', async () => {
+  testUtils.testIf(
+    testUtils.isTestPlatformEmpty || testUtils.isTestPlatformDocker,
+  )('lock deletes the session token', async () => {
     await execUtils.pkStdio(
       ['agent', 'unlock'],
       {
@@ -51,7 +53,7 @@ describe('lock', () => {
     expect(await session.readToken()).toBeUndefined();
     await session.stop();
   });
-  runTestIfPlatforms()(
+  testUtils.testIf(testUtils.isTestPlatformEmpty)(
     'lock ensures re-authentication is required',
     async () => {
       const password = agentPassword;

diff --git a/tests/bin/agent/lockall.test.ts b/tests/bin/agent/lockall.test.ts
@@ -7,7 +7,7 @@ import Session from '@/sessions/Session';
 import config from '@/config';
 import * as errors from '@/errors';
 import * as execUtils from '../../utils/exec';
-import { runTestIfPlatforms } from '../../utils';
+import * as testUtils from '../../utils';
 import { globalRootKeyPems } from '../../fixtures/globalRootKeyPems';
 
 /**
@@ -32,35 +32,34 @@ describe('lockall', () => {
   afterEach(async () => {
     await agentClose();
   });
-  runTestIfPlatforms('docker')(
-    'lockall deletes the session token',
-    async () => {
-      await execUtils.pkStdio(
-        ['agent', 'unlock'],
-        {
-          PK_NODE_PATH: agentDir,
-          PK_PASSWORD: agentPassword,
-        },
-        agentDir,
-      );
-      const { exitCode } = await execUtils.pkStdio(
-        ['agent', 'lockall'],
-        {
-          PK_NODE_PATH: agentDir,
-        },
-        agentDir,
-      );
-      expect(exitCode).toBe(0);
-      const session = await Session.createSession({
-        sessionTokenPath: path.join(agentDir, config.defaults.tokenBase),
-        fs,
-        logger,
-      });
-      expect(await session.readToken()).toBeUndefined();
-      await session.stop();
-    },
-  );
-  runTestIfPlatforms()(
+  testUtils.testIf(
+    testUtils.isTestPlatformEmpty || testUtils.isTestPlatformDocker,
+  )('lockall deletes the session token', async () => {
+    await execUtils.pkStdio(
+      ['agent', 'unlock'],
+      {
+        PK_NODE_PATH: agentDir,
+        PK_PASSWORD: agentPassword,
+      },
+      agentDir,
+    );
+    const { exitCode } = await execUtils.pkStdio(
+      ['agent', 'lockall'],
+      {
+        PK_NODE_PATH: agentDir,
+      },
+      agentDir,
+    );
+    expect(exitCode).toBe(0);
+    const session = await Session.createSession({
+      sessionTokenPath: path.join(agentDir, config.defaults.tokenBase),
+      fs,
+      logger,
+    });
+    expect(await session.readToken()).toBeUndefined();
+    await session.stop();
+  });
+  testUtils.testIf(testUtils.isTestPlatformEmpty)(
     'lockall ensures reauthentication is required',
     async () => {
       const password = agentPassword;
@@ -96,44 +95,43 @@ describe('lockall', () => {
       mockedPrompts.mockClear();
     },
   );
-  runTestIfPlatforms('docker')(
-    'lockall causes old session tokens to fail',
-    async () => {
-      await execUtils.pkStdio(
-        ['agent', 'unlock'],
-        {
-          PK_NODE_PATH: agentDir,
-          PK_PASSWORD: agentPassword,
-        },
-        agentDir,
-      );
-      const session = await Session.createSession({
-        sessionTokenPath: path.join(agentDir, config.defaults.tokenBase),
-        fs,
-        logger,
-      });
-      const token = await session.readToken();
-      await session.stop();
-      await execUtils.pkStdio(
-        ['agent', 'lockall'],
-        {
-          PK_NODE_PATH: agentDir,
-          PK_PASSWORD: agentPassword,
-        },
-        agentDir,
-      );
-      // Old token is invalid
-      const { exitCode, stderr } = await execUtils.pkStdio(
-        ['agent', 'status', '--format', 'json'],
-        {
-          PK_NODE_PATH: agentDir,
-          PK_TOKEN: token,
-        },
-        agentDir,
-      );
-      execUtils.expectProcessError(exitCode, stderr, [
-        new errors.ErrorClientAuthDenied(),
-      ]);
-    },
-  );
+  testUtils.testIf(
+    testUtils.isTestPlatformEmpty || testUtils.isTestPlatformDocker,
+  )('lockall causes old session tokens to fail', async () => {
+    await execUtils.pkStdio(
+      ['agent', 'unlock'],
+      {
+        PK_NODE_PATH: agentDir,
+        PK_PASSWORD: agentPassword,
+      },
+      agentDir,
+    );
+    const session = await Session.createSession({
+      sessionTokenPath: path.join(agentDir, config.defaults.tokenBase),
+      fs,
+      logger,
+    });
+    const token = await session.readToken();
+    await session.stop();
+    await execUtils.pkStdio(
+      ['agent', 'lockall'],
+      {
+        PK_NODE_PATH: agentDir,
+        PK_PASSWORD: agentPassword,
+      },
+      agentDir,
+    );
+    // Old token is invalid
+    const { exitCode, stderr } = await execUtils.pkStdio(
+      ['agent', 'status', '--format', 'json'],
+      {
+        PK_NODE_PATH: agentDir,
+        PK_TOKEN: token,
+      },
+      agentDir,
+    );
+    execUtils.expectProcessError(exitCode, stderr, [
+      new errors.ErrorClientAuthDenied(),
+    ]);
+  });
 });