Update tests

jestjs · Jun 21, 2018 · e011fe9 · e011fe9
1 parent 65cdbc8
commit e011fe9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/TestUtils.js b/TestUtils.js
@@ -56,6 +56,7 @@ const DEFAULT_GLOBAL_CONFIG: GlobalConfig = {
   testNamePattern: '',
   testPathPattern: '',
   testResultsProcessor: null,
+  testRetries: 0,
   updateSnapshot: 'none',
   useStderr: false,
   verbose: false,
@@ -108,6 +109,7 @@ const DEFAULT_PROJECT_CONFIG: ProjectConfig = {
   testMatch: [],
   testPathIgnorePatterns: [],
   testRegex: '.test.js$',
+  testRetries: 0,
   testRunner: 'jest-jasmine2',
   testURL: '',
   timers: 'real',

diff --git a/e2e/__tests__/__snapshots__/show_config.test.js.snap b/e2e/__tests__/__snapshots__/show_config.test.js.snap
@@ -57,6 +57,7 @@ exports[`--showConfig outputs config info and exits 1`] = `
         \\"/node_modules/\\"
       ],
       \\"testRegex\\": \\"\\",
+      \\"testRetries\\": 0,
       \\"testRunner\\": \\"<<REPLACED_JEST_PACKAGES_DIR>>/jest-jasmine2/build/index.js\\",
       \\"testURL\\": \\"about:blank\\",
       \\"timers\\": \\"real\\",
@@ -106,6 +107,7 @@ exports[`--showConfig outputs config info and exits 1`] = `
     \\"testFailureExitCode\\": 1,
     \\"testPathPattern\\": \\"\\",
     \\"testResultsProcessor\\": null,
+    \\"testRetries\\": 0,
     \\"updateSnapshot\\": \\"all\\",
     \\"useStderr\\": false,
     \\"verbose\\": null,

diff --git a/packages/jest-cli/src/cli/args.js b/packages/jest-cli/src/cli/args.js
@@ -52,7 +52,10 @@ export const check = (argv: Argv) => {
   }
 
   const intRetries = parseInt(argv.testRetries, 10);
-  if (isNaN(intRetries) || intRetries < 0) {
+  if (
+    (argv.hasOwnProperty('testRetries') && isNaN(intRetries)) ||
+    intRetries < 0
+  ) {
     throw new Error(
       'The --testRetries option requires a positive integer to be specified.\n' +
         'Example usage: jest --testRetries=3',

diff --git a/types/Argv.js b/types/Argv.js
@@ -83,7 +83,7 @@ export type Argv = {|
   testPathPattern: Array<string>,
   testRegex: string,
   testResultsProcessor: ?string,
-  testRetries: ?string,
+  testRetries: number,
   testRunner: string,
   testURL: string,
   timers: 'real' | 'fake',

diff --git a/types/Config.js b/types/Config.js
@@ -74,7 +74,7 @@ export type DefaultOptions = {|
   testPathIgnorePatterns: Array<string>,
   testRegex: string,
   testResultsProcessor: ?string,
-  testRetries: string | number,
+  testRetries: ?number,
   testRunner: ?string,
   testURL: string,
   timers: 'real' | 'fake',
@@ -164,7 +164,7 @@ export type InitialOptions = {
   testPathIgnorePatterns?: Array<string>,
   testRegex?: string,
   testResultsProcessor?: ?string,
-  testRetries?: string | number,
+  testRetries?: ?number,
   testRunner?: string,
   testURL?: string,
   timers?: 'real' | 'fake',
@@ -280,7 +280,7 @@ export type ProjectConfig = {|
   testLocationInResults: boolean,
   testPathIgnorePatterns: Array<string>,
   testRegex: string,
-  testRetries: ?string,
+  testRetries: number,
   testRunner: string,
   testURL: string,
   timers: 'real' | 'fake',