migrate function signature

jestjs · Jun 4, 2020 · b1476b4 · b1476b4
1 parent 068ec04
commit b1476b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/packages/jest-console/src/getConsoleOutput.ts b/packages/jest-console/src/getConsoleOutput.ts
@@ -15,20 +15,11 @@ import type {Config} from '@jest/types';
 import type {ConsoleBuffer} from './types';
 
 export default (
-  // TODO: remove in 27
-  root: string,
-  // TODO: this is covered by GlobalConfig, switch over in 27
-  verbose: boolean,
   buffer: ConsoleBuffer,
-  // TODO: make mandatory and take Config.ProjectConfig in 27
-  config: StackTraceConfig = {
-    rootDir: root,
-    testMatch: [],
-  },
-  // TODO: make mandatory in 27
-  globalConfig?: Config.GlobalConfig,
+  config: StackTraceConfig,
+  globalConfig: Config.GlobalConfig,
 ): string => {
-  const TITLE_INDENT = verbose ? '  ' : '    ';
+  const TITLE_INDENT = globalConfig.verbose ? '  ' : '    ';
   const CONSOLE_INDENT = TITLE_INDENT + '  ';
 
   const logEntries = buffer.reduce((output, {type, message, origin}) => {

diff --git a/packages/jest-reporters/src/default_reporter.ts b/packages/jest-reporters/src/default_reporter.ts
@@ -178,13 +178,7 @@ export default class DefaultReporter extends BaseReporter {
         '  ' +
           TITLE_BULLET +
           'Console\n\n' +
-          getConsoleOutput(
-            config.cwd,
-            !!this._globalConfig.verbose,
-            result.console,
-            config,
-            this._globalConfig,
-          ),
+          getConsoleOutput(result.console, config, this._globalConfig),
       );
     }
   }

diff --git a/packages/jest-runner/src/runTest.ts b/packages/jest-runner/src/runTest.ts
@@ -116,8 +116,6 @@ async function runTestInternal(
   const consoleOut = globalConfig.useStderr ? process.stderr : process.stdout;
   const consoleFormatter = (type: LogType, message: LogMessage) =>
     getConsoleOutput(
-      config.cwd,
-      !!globalConfig.verbose,
       // 4 = the console call is buried 4 stack frames deep
       BufferedConsole.write([], type, message, 4),
       config,