try to fix node assert

jestjs · May 21, 2018 · 5cae4b3 · 5cae4b3
1 parent dbb6248
commit 5cae4b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/integration-tests/__tests__/__snapshots__/failures.test.js.snap b/integration-tests/__tests__/__snapshots__/failures.test.js.snap
@@ -143,7 +143,7 @@ exports[`not throwing Error objects 5`] = `
       10 | 
       
       
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
+      at packages/jest-jasmine2/build/jasmine/Spec.js:50:20
       at __tests__/during_tests.test.js:7:1
 
   ● Boolean thrown during test
@@ -159,7 +159,7 @@ exports[`not throwing Error objects 5`] = `
       14 | });
       
       
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
+      at packages/jest-jasmine2/build/jasmine/Spec.js:50:20
       at __tests__/during_tests.test.js:11:1
 
   ● undefined thrown during test
@@ -175,7 +175,7 @@ exports[`not throwing Error objects 5`] = `
       19 | });
       
       
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
+      at packages/jest-jasmine2/build/jasmine/Spec.js:50:20
       at __tests__/during_tests.test.js:16:1
 
   ● Object thrown during test
@@ -198,7 +198,7 @@ exports[`not throwing Error objects 5`] = `
       24 | });
       
       
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
+      at packages/jest-jasmine2/build/jasmine/Spec.js:50:20
       at __tests__/during_tests.test.js:21:1
 
   ● Error during test
@@ -391,7 +391,7 @@ exports[`works with async failures 1`] = `
       29 | 
       30 |   setTimeout(done, 10);
       
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
+      at packages/jest-jasmine2/build/jasmine/Spec.js:50:20
       at __tests__/async_failures.test.js:27:1
 
 "

diff --git a/integration-tests/__tests__/failures.test.js b/integration-tests/__tests__/failures.test.js
@@ -130,7 +130,7 @@ test('works with node assert', () => {
       69 | 
       
       
-      at packages/jest-jasmine2/build/jasmine/Spec.js:85:20
+      at packages/jest-jasmine2/build/jasmine/Spec.js:50:20
       at __tests__/node_assertion_error.test.js:66:1
 `;
 

diff --git a/packages/jest-jasmine2/src/jasmine/Spec.js b/packages/jest-jasmine2/src/jasmine/Spec.js
@@ -31,8 +31,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* @flow */
 /* eslint-disable sort-keys */
 
-import {AssertionError} from 'assert';
-
 import ExpectationFailed from '../expectation_failed';
 
 import expectationResultFactory from '../expectation_result_factory';
@@ -137,12 +135,12 @@ Spec.prototype.onException = function onException(error) {
     return;
   }
 
-  if (error instanceof ExpectationFailed) {
-    return;
+  if (error && error.code === 'ERR_ASSERTION') {
+    error = assertionErrorMessage(error, {expand: this.expand});
   }
 
-  if (error instanceof AssertionError) {
-    error = assertionErrorMessage(error, {expand: this.expand});
+  if (error instanceof ExpectationFailed) {
+    return;
   }
 
   this.addExpectationResult(