fix: always pass column width

jest-community · Nov 13, 2019 · 636edb8 · 636edb8
1 parent 73bfbf6
commit 636edb8
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 26 deletions.
diff --git a/src/Reporter.tsx b/src/Reporter.tsx
@@ -70,11 +70,8 @@ const TestConsoleOutput = ({
 };
 
 const CompletedTests: React.FC<{
-  completedTests: Array<{
-    testResult: TestResult;
-    config: Config.ProjectConfig;
-  }>;
-  width?: number;
+  completedTests: State['completedTests'];
+  width: number;
   globalConfig: Config.GlobalConfig;
 }> = ({ completedTests, width, globalConfig }) => {
   if (completedTests.length === 0) {
@@ -86,7 +83,7 @@ const CompletedTests: React.FC<{
     <Box paddingBottom={1} flexDirection="column">
       <Static>
         {completedTests.map(({ testResult, config }) => (
-          <React.Fragment key={testResult.testFilePath}>
+          <React.Fragment key={testResult.testFilePath + config.name}>
             <ResultHeader
               config={config || globalConfig}
               testResult={testResult}
@@ -176,6 +173,32 @@ const reporterReducer: React.Reducer<State, DateEvents> = (
   }
 };
 
+const RunningTests: React.FC<{
+  tests: State['currentTests'];
+  width: number;
+}> = ({ tests, width }) => {
+  if (tests.length === 0) {
+    return null;
+  }
+
+  return (
+    <Box paddingBottom={1} flexDirection="column">
+      {tests.map(([path, config]) => (
+        <Box key={path + config.name}>
+          <Runs />
+          <DisplayName config={config} />
+          <FormattedPath
+            pad={8}
+            columns={width}
+            config={config}
+            testPath={path}
+          />
+        </Box>
+      ))}
+    </Box>
+  );
+};
+
 const Reporter: React.FC<Props> = ({
   register,
   globalConfig,
@@ -220,22 +243,7 @@ const Reporter: React.FC<Props> = ({
         width={width}
         globalConfig={globalConfig}
       />
-      {currentTests.length > 0 && (
-        <Box paddingBottom={1} flexDirection="column">
-          {currentTests.map(([path, config]) => (
-            <Box key={path + config.name}>
-              <Runs />
-              <DisplayName config={config || globalConfig} />
-              <FormattedPath
-                pad={8}
-                columns={width}
-                config={config || globalConfig}
-                testPath={path}
-              />
-            </Box>
-          ))}
-        </Box>
-      )}
+      <RunningTests tests={currentTests} width={width} />
       <Summary
         aggregatedResults={aggregatedResults}
         options={{ estimatedTime, roundTime: true, width }}

diff --git a/src/shared.tsx b/src/shared.tsx
@@ -69,7 +69,7 @@ const TestStatus: React.FC<{ testResult: TestResult }> = ({ testResult }) => {
 export const ResultHeader: React.FC<{
   testResult: TestResult;
   config: Config.ProjectConfig;
-  width?: number;
+  width: number;
 }> = ({ testResult, config, width }) => (
   <Box>
     <TestStatus testResult={testResult} />
@@ -92,9 +92,9 @@ export const FormattedPath = ({
   pad: number;
   config: Config.ProjectConfig | Config.GlobalConfig;
   testPath: Config.Path;
-  columns?: number;
+  columns: number;
 }) => {
-  const maxLength = (columns || 0) - pad;
+  const maxLength = columns - pad;
   const relative = relativePath(config, testPath);
   const { basename } = relative;
   let { dirname } = relative;
@@ -147,5 +147,6 @@ export const FormatFullTestPath: React.FC<{
   config: Config.GlobalConfig | Config.ProjectConfig;
   testPath: Config.Path;
 }> = ({ config, testPath }) => (
-  <FormattedPath config={config} testPath={testPath} pad={0} />
+  // TODO: maybe not 9000? We just don't want to trim it
+  <FormattedPath config={config} testPath={testPath} pad={0} columns={9000} />
 );