fix: put summary in <Static>

Fixes #9
jest-community · Nov 15, 2019 · 5445038 · 5445038
1 parent 6e330e3
commit 5445038
Showing 1 changed file with 48 additions and 35 deletions.
diff --git a/src/Reporter.tsx b/src/Reporter.tsx
@@ -83,35 +83,43 @@ const FailureMessage: React.FC<{
 const CompletedTests: React.FC<{
  completedTests: State['completedTests'];
  globalConfig: Config.GlobalConfig;
-}> = ({ completedTests, globalConfig }) => {
+ summary: React.ReactElement;
+ PostMessage: () => React.ReactElement;
+ done: boolean;
+}> = ({ completedTests, globalConfig, summary, PostMessage, done }) => {
  if (completedTests.length === 0) {
  return null;
  }
  const didUpdate = globalConfig.updateSnapshot === 'all';
 
+ let testOutputs = completedTests.map(({ testResult, config }) => (
+ <React.Fragment key={testResult.testFilePath + config.name}>
+ <ResultHeader config={config} testResult={testResult} />
+ <VerboseTestList testResult={testResult} globalConfig={globalConfig} />
+ <TestConsoleOutput
+ console={testResult.console}
+ verbose={globalConfig.verbose}
+ cwd={config.cwd}
+ />
+ <FailureMessage failureMessage={testResult.failureMessage} />
+ <SnapshotStatus snapshot={testResult.snapshot} afterUpdate={didUpdate} />
+ </React.Fragment>
+ ));
+
+ if (done) {
+ testOutputs = testOutputs.concat(
+ <Box paddingTop={1} key="summary">
+ {summary}
+ </Box>,
+ <React.Fragment key="postmessage">
+ <PostMessage />
+ </React.Fragment>,
+ );
+ }
+
  return (
  <Box paddingBottom={1} flexDirection="column">
- <Static>
- {completedTests.map(({ testResult, config }) => (
- <React.Fragment key={testResult.testFilePath + config.name}>
- <ResultHeader config={config} testResult={testResult} />
- <VerboseTestList
- testResult={testResult}
- globalConfig={globalConfig}
- />
- <TestConsoleOutput
- console={testResult.console}
- verbose={globalConfig.verbose}
- cwd={config.cwd}
- />
- <FailureMessage failureMessage={testResult.failureMessage} />
- <SnapshotStatus
- snapshot={testResult.snapshot}
- afterUpdate={didUpdate}
- />
- </React.Fragment>
- ))}
- </Static>
+ <Static>{testOutputs}</Static>
  </Box>
  );
 };
@@ -241,29 +249,34 @@ const Reporter: React.FC<Props> = ({
  const { exit } = useApp();
  React.useEffect(() => {
  if (done) {
- exit();
+ setImmediate(exit);
  }
  }, [done, exit]);
 
+ const summary = (
+ <Summary
+ aggregatedResults={aggregatedResults}
+ options={{ estimatedTime, roundTime: true, width }}
+ done={done}
+ />
+ );
  return (
  <Box flexDirection="column">
  <CompletedTests
  completedTests={completedTests}
  globalConfig={globalConfig}
- />
- <RunningTests tests={currentTests} width={width} />
- <Summary
- aggregatedResults={aggregatedResults}
- options={{ estimatedTime, roundTime: true, width }}
+ summary={summary}
  done={done}
+ PostMessage={() => (
+ <PostMessage
+ aggregatedResults={aggregatedResults}
+ globalConfig={globalConfig}
+ contexts={contexts}
+ />
+ )}
  />
- {done ? (
- <PostMessage
- aggregatedResults={aggregatedResults}
- globalConfig={globalConfig}
- contexts={contexts}
- />
- ) : null}
+ <RunningTests tests={currentTests} width={width} />
+ {done ? null : summary}
  </Box>
  );
 };