Fix tests, unbreak master.

Author: cpojer

packages/jest-config/src/__tests__/set_from_argv.test.js

@@ -23,7 +23,8 @@ test('maps special values to valid options', () => {
     collectCoverage: true,
     testEnvironment: 'node',
     useStderr: true,
-    watch: true,
+    watch: false,
+    watchAll: true,
   });
 });
 

…rc/__tests__/format_test_results_test.js …rc/__tests__/format_test_results.test.jspackages/jest-util/src/__tests__/format_test_results_test.js renamed to packages/jest-util/src/__tests__/format_test_results.test.js packages/jest-util/src/__tests__/format_test_results_test.js renamed to packages/jest-util/src/__tests__/format_test_results.test.js

@@ -9,7 +9,7 @@
 
 'use strict';
 
-const formatTestResults = require('../formatTestResults');
+const formatTestResults = require('../format_test_results');
 
 describe('formatTestResults', () => {
   const assertion = {