.toThrowError()

integration_tests/__tests__/__snapshots__/console-test.js.snap

@@ -11,7 +11,7 @@ exports[`test console printing 1`] = `
       This is a error message.
  PASS  __tests__/console2-test.js
   ● Console
-    error __tests__/console2-test.js:11
+    error __tests__/console2-test.js:18
       This is an error from another test file."
 `;
 
@@ -28,7 +28,7 @@ exports[`test console printing with --verbose 1`] = `
   error __tests__/console-test.js:17
     This is a error message.
 
-  error __tests__/console2-test.js:11
+  error __tests__/console2-test.js:18
     This is an error from another test file.
 
 "

integration_tests/__tests__/console-test.js

@@ -23,7 +23,7 @@ test('console printing', () => {
 });
 
 test('console printing with --verbose', () => {
-  const result = runJest('console', ['--verbose']);
+  const result = runJest('console', ['--verbose', '--no-cache']);
   const stdout = result.stdout.toString();
 
   expect(result.status).toBe(0);

integration_tests/console/__tests__/console2-test.js

@@ -7,7 +7,14 @@
  */
 'use strict';
 
+jest.useRealTimers();
+
 test('works just fine', () => {
-  console.error('This is an error from another test file.');
+  return new Promise(resolve => {
+    // Make the second test finish last to get consistent console
+    // output
+    setTimeout(resolve, 3000);
+  }).then(() => {
+    console.error('This is an error from another test file.');
+  });
 });
-

packages/jest-matcher-utils/package.json

@@ -10,5 +10,8 @@
   "main": "build/index.js",
   "scripts": {
     "test": "../../packages/jest-cli/bin/jest.js"
+  },
+  "dependencies": {
+    "chalk": "^1.1.3"
   }
 }

packages/jest-matcher-utils/src/__tests__/index-test.js

@@ -53,4 +53,6 @@ describe('.getType()', () => {
   test('function', () => expect(getType(() => {})).toBe('function'));
   test('boolean', () => expect(getType(true)).toBe('boolean'));
   test('symbol', () => expect(getType(Symbol.for('a'))).toBe('symbol'));
+  test('regexp', () => expect(getType(/abc/)).toBe('regexp'));
+
 });

packages/jest-matcher-utils/src/index.js

@@ -10,7 +10,19 @@
 
 'use strict';
 
-import type {ValueType} from 'types/Values';
+export type ValueType =
+  | 'array'
+  | 'boolean'
+  | 'function'
+  | 'null'
+  | 'number'
+  | 'object'
+  | 'regexp'
+  | 'string'
+  | 'symbol'
+  | 'undefined';
+
+const chalk = require('chalk');
 
 // get the type of a value with handling the edge cases like `typeof []`
 // and `typeof null`
@@ -30,6 +42,9 @@ const getType = (value: any): ValueType => {
   } else if (typeof value === 'string') {
     return 'string';
   } else if (typeof value === 'object') {
+    if (value.constructor === RegExp) {
+      return 'regexp';
+    }
     return 'object';
   // $FlowFixMe https://github.com/facebook/flow/issues/1015
   } else if (typeof value === 'symbol') {
@@ -75,6 +90,8 @@ const stringify = (obj: any): string => {
   });
 };
 
+const highlight = (obj: any) => chalk.cyan.bold(stringify(obj));
+
 const ensureNoExpected = (expected: any, matcherName: string) => {
   matcherName || (matcherName = 'This');
   if (typeof expected !== 'undefined') {
@@ -108,10 +125,11 @@ const ensureNumbers = (actual: any, expected: any, matcherName: string) => {
 };
 
 module.exports = {
-  getType,
-  stringify,
-  ensureNoExpected,
   ensureActualIsNumber,
   ensureExpectedIsNumber,
+  ensureNoExpected,
   ensureNumbers,
+  getType,
+  highlight,
+  stringify,
 };

packages/jest-matchers/src/__tests__/__snapshots__/toThrowMatchers-test.js.snap

@@ -0,0 +1,47 @@
+exports[`.toThrowError() error class did not throw at all 1`] = `"Expected the function to throw an error of \"Err\" type, but it didn\'t."`;
+
+exports[`.toThrowError() error class threw, but class did not match 1`] = `
+"Expected the function to throw an error of \"Err2\" type, but it didn\'t.
+Actual error:
+  Type: \"Err\"
+  Message: \"apple\""
+`;
+
+exports[`.toThrowError() error class threw, but should not have 1`] = `
+"Expected the function to not throw an error of \"Err\" type, but it did.
+Actual error:
+  Type: \"Err\"
+  Message: \"apple\""
+`;
+
+exports[`.toThrowError() regexp did not throw at all 1`] = `"Expected the function to throw an error matching \"/apple/\", but it didn\'t."`;
+
+exports[`.toThrowError() regexp threw, but message did not match 1`] = `
+"Expected the function to throw an error matching \"/banana/\", but it didn\'t.
+Actual error:
+  Type: \"Error\"
+  Message: \"apple\""
+`;
+
+exports[`.toThrowError() regexp threw, but should not have 1`] = `
+"Expected the function to not throw an error matching \"/apple/\", but it did.
+Actual error:
+  Type: \"Error\"
+  Message: \"apple\""
+`;
+
+exports[`.toThrowError() strings did not throw at all 1`] = `"Expected the function to throw an error matching \"apple\", but it didn\'t."`;
+
+exports[`.toThrowError() strings threw, but message did not match 1`] = `
+"Expected the function to throw an error matching \"banana\", but it didn\'t.
+Actual error:
+  Type: \"Error\"
+  Message: \"apple\""
+`;
+
+exports[`.toThrowError() strings threw, but should not have 1`] = `
+"Expected the function to not throw an error matching \"apple\", but it did.
+Actual error:
+  Type: \"Error\"
+  Message: \"apple\""
+`;

packages/jest-matchers/src/__tests__/spy-matchers-test.js → packages/jest-matchers/src/__tests__/spyMatchers-test.js

@@ -49,9 +49,7 @@ describe('.toHaveBeenCalledTimes()', () => {
   it('accept only numbers', () => {
     const foo = jasmine.createSpy('foo');
     foo();
-
-    expect(() => jestExpect(foo).toHaveBeenCalledTimes(1))
-      .not.toThrowError();
+    jestExpect(foo).toHaveBeenCalledTimes(1);
 
     [{}, [], true, 'a', new Map(), () => {}].forEach(value => {
       expect(() => jestExpect(foo).toHaveBeenCalledTimes(value))

packages/jest-matchers/src/__tests__/toThrowMatchers-test.js

@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @emails oncall+jsinfra
+ */
+
+'use strict';
+
+describe('.toThrowError()', () => {
+  describe('strings', () => {
+    it('passes', () => {
+      expect(() => { throw new Error('apple'); }).toThrowError('apple');
+      expect(() => { throw new Error('banana'); }).not.toThrowError('apple');
+      expect(() => {}).not.toThrowError('apple');
+    });
+
+    test('did not throw at all', () => {
+      let error;
+      try {
+        expect(() => {}).toThrowError('apple');
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test('threw, but message did not match', () => {
+      let error;
+      try {
+        expect(() => { throw new Error('apple'); }).toThrowError('banana');
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test('threw, but should not have', () => {
+      let error;
+      try {
+        expect(() => { throw new Error('apple'); }).not.toThrowError('apple');
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+
+  describe('regexp', () => {
+    it('passes', () => {
+      expect(() => { throw new Error('apple'); }).toThrowError(/apple/);
+      expect(() => { throw new Error('banana'); }).not.toThrowError(/apple/);
+      expect(() => {}).not.toThrowError(/apple/);
+    });
+
+    test('did not throw at all', () => {
+      let error;
+      try {
+        expect(() => {}).toThrowError(/apple/);
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test('threw, but message did not match', () => {
+      let error;
+      try {
+        expect(() => { throw new Error('apple'); }).toThrowError(/banana/);
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test('threw, but should not have', () => {
+      let error;
+      try {
+        expect(() => { throw new Error('apple'); }).not.toThrowError(/apple/);
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+
+  describe('error class', () => {
+    class Err extends Error {}
+    class Err2 extends Error {}
+
+    it('passes', () => {
+      expect(() => { throw new Err(); }).toThrowError(Err);
+      expect(() => { throw new Err(); }).toThrowError(Error);
+      expect(() => { throw new Err(); }).not.toThrowError(Err2);
+      expect(() => {}).not.toThrowError(Err);
+    });
+
+    test('did not throw at all', () => {
+      let error;
+      try {
+        expect(() => {}).toThrowError(Err);
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test('threw, but class did not match', () => {
+      let error;
+      try {
+        expect(() => { throw new Err('apple'); }).toThrowError(Err2);
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+
+    test('threw, but should not have', () => {
+      let error;
+      try {
+        expect(() => { throw new Err('apple'); }).not.toThrowError(Err);
+      } catch (e) {
+        error = e;
+      }
+
+      expect(error).toBeDefined();
+      expect(error.message).toMatchSnapshot();
+    });
+  });
+});

packages/jest-matchers/src/index.js

@@ -20,9 +20,15 @@ import type {
 } from './types';
 
 const matchers = require('./matchers');
-const spyMatchers = require('./spy-matchers');
+const spyMatchers = require('./spyMatchers');
+const toThrowMatchers = require('./toThrowMatchers');
+
+const {stringify} = require('jest-matcher-utils');
+
 const GLOBAL_MATCHERS_OBJECT_SYMBOL = Symbol.for('$$jest-matchers-object');
 
+class JestAssertionError extends Error {}
+
 if (!global[GLOBAL_MATCHERS_OBJECT_SYMBOL]) {
   Object.defineProperty(
     global,
@@ -57,6 +63,8 @@ const makeThrowingMatcher = (
       {args: arguments},
     );
 
+    _validateResult(result);
+
     if ((result.pass && isNot) || (!result.pass && !isNot)) { // XOR
       let message = result.message;
 
@@ -66,7 +74,7 @@ const makeThrowingMatcher = (
         message = message();
       }
 
-      const error = new Error(message);
+      const error = new JestAssertionError(message);
       // Remove this function from the stack trace frame.
       Error.captureStackTrace(error, throwingMatcher);
       throw error;
@@ -78,9 +86,29 @@ const addMatchers = (matchersObj: MatchersObject): void => {
   Object.assign(global[GLOBAL_MATCHERS_OBJECT_SYMBOL], matchersObj);
 };
 
+const _validateResult = result => {
+  if (
+    typeof result !== 'object' ||
+    typeof result.pass !== 'boolean' ||
+    !(
+      typeof result.message === 'string' ||
+      typeof result.message === 'function'
+    )
+  ) {
+    throw new Error(
+      'Unexpected return from a matcher function.\n' +
+      'Matcher functions should ' +
+      'return an object in the following format:\n' +
+      '  {message: string | function, pass: boolean}\n' +
+      `'${stringify(result)}' was returned`,
+    );
+  }
+};
+
 // add default jest matchers
 addMatchers(matchers);
 addMatchers(spyMatchers);
+addMatchers(toThrowMatchers);
 
 module.exports = {
   addMatchers,