chore: fix review

jestjs · Aug 24, 2021 · c628bda · c628bda
1 parent 0517ccb
commit c628bda
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 22 deletions.
diff --git a/packages/jest-console/src/BufferedConsole.ts b/packages/jest-console/src/BufferedConsole.ts
@@ -7,7 +7,7 @@
 
 import assert = require('assert');
 import {Console} from 'console';
-import {format, formatWithOptions, inspect, InspectOptions} from 'util';
+import {InspectOptions, format, formatWithOptions, inspect} from 'util';
 import chalk = require('chalk');
 import {ErrorWithStack, formatTime} from 'jest-util';
 import type {

diff --git a/packages/jest-console/src/CustomConsole.ts b/packages/jest-console/src/CustomConsole.ts
@@ -7,7 +7,7 @@
 
 import assert = require('assert');
 import {Console} from 'console';
-import {format, formatWithOptions, inspect, InspectOptions} from 'util';
+import {InspectOptions, format, formatWithOptions, inspect} from 'util';
 import chalk = require('chalk');
 import {clearLine, formatTime} from 'jest-util';
 import type {LogCounters, LogMessage, LogTimers, LogType} from './types';

diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts
@@ -68,7 +68,8 @@ const install = (
 const each = (
   table: Global.EachTable,
   ...data: Global.TemplateData
-): ReturnType<typeof install> => install(global as unknown as typeof globalThis, table, ...data);
+): ReturnType<typeof install> =>
+  install(global as unknown as typeof globalThis, table, ...data);
 
 each.withGlobal =
   (g: typeof globalThis) =>

diff --git a/packages/jest-environment-jsdom/src/index.ts b/packages/jest-environment-jsdom/src/index.ts
@@ -105,7 +105,10 @@ class JSDOMEnvironment implements JestEnvironment<number> {
       timerConfig,
     });
 
-    this.fakeTimersModern = new ModernFakeTimers({config, global: global as any as typeof globalThis});
+    this.fakeTimersModern = new ModernFakeTimers({
+      config,
+      global: global as any as typeof globalThis,
+    });
   }
 
   async setup(): Promise<void> {}

diff --git a/packages/jest-environment/src/index.ts b/packages/jest-environment/src/index.ts
@@ -32,10 +32,10 @@ export type ModuleWrapper = (
   ...extraGlobals: Array<Global.Global[keyof Global.Global]>
 ) => unknown;
 
-export declare class JestEnvironment<T = unknown> {
+export declare class JestEnvironment<Timer = unknown> {
   constructor(config: Config.ProjectConfig, context?: EnvironmentContext);
   global: Global.Global;
-  fakeTimers: LegacyFakeTimers<T> | null;
+  fakeTimers: LegacyFakeTimers<Timer> | null;
   fakeTimersModern: ModernFakeTimers | null;
   moduleMocker: ModuleMocker | null;
   getVmContext(): Context | null;

diff --git a/packages/jest-jasmine2/src/jasmine/Env.ts b/packages/jest-jasmine2/src/jasmine/Env.ts
@@ -104,8 +104,10 @@ export default function (j$: Jasmine) {
 
       let catchExceptions = true;
 
-      const realSetTimeout = global.setTimeout as typeof globalThis['setTimeout'];
-      const realClearTimeout = global.clearTimeout as typeof globalThis['clearTimeout'];
+      const realSetTimeout =
+        global.setTimeout as typeof globalThis['setTimeout'];
+      const realClearTimeout =
+        global.clearTimeout as typeof globalThis['clearTimeout'];
 
       const runnableResources: Record<string, {spies: Array<Spy>}> = {};
       const currentlyExecutingSuites: Array<Suite> = [];

diff --git a/packages/jest-jasmine2/src/types.ts b/packages/jest-jasmine2/src/types.ts
@@ -89,7 +89,8 @@ export type Jasmine = {
   version: string;
   testPath: Config.Path;
   addMatchers: (matchers: JasmineMatchersObject) => void;
-} & typeof expect & typeof globalThis;
+} & typeof expect &
+  typeof globalThis;
 
 declare global {
   module NodeJS {

diff --git a/packages/jest-repl/src/cli/runtime-cli.ts b/packages/jest-repl/src/cli/runtime-cli.ts
@@ -84,8 +84,16 @@ export async function run(
       'console',
       new CustomConsole(process.stdout, process.stderr),
     );
-    setGlobal(environment.global as unknown as typeof globalThis, 'jestProjectConfig', config);
-    setGlobal(environment.global as unknown as typeof globalThis, 'jestGlobalConfig', globalConfig);
+    setGlobal(
+      environment.global as unknown as typeof globalThis,
+      'jestProjectConfig',
+      config,
+    );
+    setGlobal(
+      environment.global as unknown as typeof globalThis,
+      'jestGlobalConfig',
+      globalConfig,
+    );
 
     const runtime = new Runtime(
       config,

diff --git a/packages/jest-runner/src/runTest.ts b/packages/jest-runner/src/runTest.ts
@@ -156,7 +156,11 @@ async function runTestInternal(
     ? new LeakDetector(environment)
     : null;
 
-  setGlobal(environment.global as unknown as typeof globalThis, 'console', testConsole);
+  setGlobal(
+    environment.global as unknown as typeof globalThis,
+    'console',
+    testConsole,
+  );
 
   const runtime = new Runtime(
     config,

diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts
@@ -929,16 +929,18 @@ export default class Runtime {
     if (this._environment) {
       if (this._environment.global) {
         const envGlobal = this._environment.global;
-        (Object.keys(envGlobal) as Array<keyof typeof globalThis>).forEach(key => {
-          const globalMock = envGlobal[key];
-          if (
-            ((typeof globalMock === 'object' && globalMock !== null) ||
-              typeof globalMock === 'function') &&
-            globalMock._isMockFunction === true
-          ) {
-            globalMock.mockClear();
-          }
-        });
+        (Object.keys(envGlobal) as Array<keyof typeof globalThis>).forEach(
+          key => {
+            const globalMock = envGlobal[key];
+            if (
+              ((typeof globalMock === 'object' && globalMock !== null) ||
+                typeof globalMock === 'function') &&
+              globalMock._isMockFunction === true
+            ) {
+              globalMock.mockClear();
+            }
+          },
+        );
       }
 
       if (this._environment.fakeTimers) {