Move test location config into state

Author: captbaritone

packages/jest-circus/src/event_handler.js

@@ -22,6 +22,10 @@ const TEST_TIMEOUT_SYMBOL = Symbol.for('TEST_TIMEOUT_SYMBOL');
 
 const handler: EventHandler = (event, state): void => {
   switch (event.name) {
+    case 'include_test_location_in_result': {
+      state.includeTestLocationInResult = true;
+      break;
+    }
     case 'hook_start': {
       break;
     }

packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js

@@ -76,6 +76,12 @@ export const initialize = ({
     });
   }
 
+  if (config.testLocationInResults) {
+    dispatch({
+      name: 'include_test_location_in_result',
+    });
+  }
+
   // Jest tests snapshotSerializers in order preceding built-in serializers.
   // Therefore, add in reverse because the last added is the first tested.
   config.snapshotSerializers
@@ -102,7 +108,7 @@ export const runAndTransformResultsToJestFormat = async ({
   globalConfig: GlobalConfig,
   testPath: string,
 }): Promise<TestResult> => {
-  const runResult = await run(config);
+  const runResult = await run();
 
   let numFailingTests = 0;
   let numPassingTests = 0;

packages/jest-circus/src/run.js

@@ -7,8 +7,6 @@
  * @flow strict-local
  */
 
-import type {ProjectConfig} from 'types/Config';
-
 import type {
   RunResult,
   TestEntry,
@@ -30,15 +28,14 @@ import {
 
 const Promise = getOriginalPromise();
 
-const run = async (config: ProjectConfig): Promise<RunResult> => {
+const run = async (): Promise<RunResult> => {
   const {rootDescribeBlock} = getState();
   dispatch({name: 'run_start'});
   await _runTestsForDescribeBlock(rootDescribeBlock);
   dispatch({name: 'run_finish'});
   return makeRunResult(
     getState().rootDescribeBlock,
     getState().unhandledErrors,
-    config,
   );
 };
 

packages/jest-circus/src/state.js

@@ -26,6 +26,7 @@ const INITIAL_STATE: State = {
   currentDescribeBlock: ROOT_DESCRIBE_BLOCK,
   expand: undefined,
   hasFocusedTests: false, // whether .only has been used on any test/describe
+  includeTestLocationInResult: false,
   rootDescribeBlock: ROOT_DESCRIBE_BLOCK,
   testNamePattern: null,
   testTimeout: 5000,

packages/jest-circus/src/utils.js

@@ -7,7 +7,6 @@
  * @flow strict-local
  */
 
-import type {ProjectConfig} from 'types/Config';
 import type {
   AsyncFn,
   BlockMode,
@@ -29,6 +28,8 @@ import StackUtils from 'stack-utils';
 
 import prettyFormat from 'pretty-format';
 
+import {getState} from './state';
+
 // Try getting the real promise object from the context, if available. Someone
 // could have overridden it in a test. Async functions return it implicitly.
 // eslint-disable-next-line no-unused-vars
@@ -227,15 +228,15 @@ export const getTestDuration = (test: TestEntry): ?number => {
 export const makeRunResult = (
   describeBlock: DescribeBlock,
   unhandledErrors: Array<Error>,
-  config: ProjectConfig,
 ): RunResult => {
   return {
-    testResults: makeTestResults(describeBlock, config),
+    testResults: makeTestResults(describeBlock),
     unhandledErrors: unhandledErrors.map(_formatError),
   };
 };
 
 const makeTestResults = (describeBlock: DescribeBlock, config): TestResults => {
+  const {includeTestLocationInResult} = getState();
   let testResults = [];
   for (const test of describeBlock.tests) {
     const testPath = [];
@@ -251,7 +252,7 @@ const makeTestResults = (describeBlock: DescribeBlock, config): TestResults => {
     }
 
     let location = null;
-    if (config.testLocationInResults) {
+    if (includeTestLocationInResult) {
       const stackLine = test.asyncError.stack.split('\n')[1];
       const {line, column} = stackUtils.parseLine(stackLine);
       location = {column, line};

types/Circus.js

@@ -32,6 +32,9 @@ export type Hook = {
 export type EventHandler = (event: Event, state: State) => void;
 
 export type Event =
+  | {|
+      name: 'include_test_location_in_result',
+    |}
   | {|
       asyncError: Exception,
       mode: BlockMode,
@@ -156,6 +159,7 @@ export type State = {|
   testNamePattern: ?RegExp,
   expand?: boolean, // expand error messages
   unhandledErrors: Array<Exception>,
+  includeTestLocationInResult: boolean,
 |};
 
 export type DescribeBlock = {|