fix: Reset local state of assertions when using hasAssertions (jestjs…

…#4498)
tabrindle · Oct 2, 2017 · e829f48 · e829f48
1 parent 3e1131c
commit e829f48
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/expect/src/__tests__/assertion_counts.test.js b/packages/expect/src/__tests__/assertion_counts.test.js
@@ -38,6 +38,8 @@ describe('.hasAssertions()', () => {
   it('throws if passed parameters', () => {
     jestExpect(() => {
       jestExpect.hasAssertions(2);
-    }).toThrow();
+    }).toThrow(/does not accept any arguments/);
   });
+
+  it('hasAssertions not leaking to global state', () => {});
 });
diff --git a/packages/expect/src/extract_expected_assertions_errors.js b/packages/expect/src/extract_expected_assertions_errors.js
@@ -17,6 +17,14 @@ import {
 
 import {getState, setState} from './jest_matchers_object';
 
+const resetAssertionsLocalState = () => {
+  setState({
+    assertionCalls: 0,
+    expectedAssertionsNumber: null,
+    isExpectingAssertions: false,
+  });
+};
+
 // Create and format all errors related to the mismatched number of `expect`
 // calls and reset the matchers state.
 const extractExpectedAssertionsErrors = () => {
@@ -26,7 +34,9 @@ const extractExpectedAssertionsErrors = () => {
     expectedAssertionsNumber,
     isExpectingAssertions,
   } = getState();
-  setState({assertionCalls: 0, expectedAssertionsNumber: null});
+
+  resetAssertionsLocalState();
+
   if (
     typeof expectedAssertionsNumber === 'number' &&
     assertionCalls !== expectedAssertionsNumber