Fix a bunch of tests and bugs.

Reviewed By: yungsters

Differential Revision: D3111574

fb-gh-sync-id: 2be0f916ce2a83dc4cb6c2530ffec3d3c309cba2
fbshipit-source-id: 2be0f916ce2a83dc4cb6c2530ffec3d3c309cba2

Author: cpojer

packages/jest-util/lib/formatMessages.js

@@ -13,19 +13,16 @@ const path = require('path');
 
 const KEEP_TRACE_LINES = 2;
 // filter for noisy stack trace lines
-const STACK_TRACE_LINE_IGNORE_RE = new RegExp([
-  '^timers.js$',
-  '^' + path.resolve(__dirname, '..', 'lib', 'moduleMocker.js'),
-  '^' + path.resolve(__dirname, '..', '..', 'vendor', 'jasmine'),
-].join('|'));
+const STACK_TRACE_LINE_IGNORE_RE =
+  /^\s+at.*?jest(-cli)?\/(vendor|src|node_modules|packages)\//;
 
 function cleanStackTrace(stackTrace) {
   let lines = 0;
-  const keepFirstLines = () => (lines++ < KEEP_TRACE_LINES);
-  return stackTrace.split('\n').filter(line => (
-    keepFirstLines() ||
-    !/^\s+at.*?jest(-cli)?\/(vendor|src|node_modules)\//.test(line)
-  )).join('\n');
+  return stackTrace.split('\n')
+    .filter(line =>
+      (lines++ < KEEP_TRACE_LINES) || !STACK_TRACE_LINE_IGNORE_RE.test(line)
+    )
+    .join('\n');
 }
 
 function formatFailureMessage(testResult, config) {
@@ -60,11 +57,12 @@ function formatFailureMessage(testResult, config) {
                 return line;
               }
             }
-            var filePath = matches[2];
             // Filter out noisy and unhelpful lines from the stack trace.
-            if (STACK_TRACE_LINE_IGNORE_RE.test(filePath)) {
+            if (STACK_TRACE_LINE_IGNORE_RE.test(line)) {
               return null;
             }
+
+            const filePath = matches[2];
             return (
               matches[1] +
               path.relative(rootDir, filePath) +

src/lib/formatTestResults.js

@@ -12,7 +12,7 @@ const utils = require('jest-util');
 const formatResult = (testResult, codeCoverageFormatter, reporter) => {
   const output = {
     name: testResult.testFilePath,
-    summary: '', // TODO
+    summary: '',
     message: '',
   };
 
@@ -32,37 +32,14 @@ const formatResult = (testResult, codeCoverageFormatter, reporter) => {
 
     if (!allTestsPassed) {
       output.message = utils.formatFailureMessage(testResult, {
-        rootPath: '',
-        useColor: false,
+        rootDir: '',
       });
     }
   }
 
   return output;
 };
 
-/**
- * @callback codeCoverageFormatter
- * @param {*} results
- * @param {*} reporter - an instance of the testReporter
- */
-
-/**
- * Formats the test results.
- * @param {*} results - a results hash determined by the reporter
- * @param {codeCoverageFormatter} codeCoverageFormatter
- * @param {*} reporter - an instance of the testReporter
- * @returns {{success: *, startTime: (*|number|Number),
- *  numTotalTests: *,
- *  numTotalTestSuites: *,
- *  numRuntimeErrorTestSuites: *,
- *  numPassedTests: *,
- *  numFailedTests: *,
- *  numPendingTests: *,
- *  testResults: (*|{}|Array),
- *  postSuiteHeaders: *}}
- */
-
 function formatTestResults(results, codeCoverageFormatter, reporter) {
   if (!codeCoverageFormatter) {
     codeCoverageFormatter = coverage => coverage;