diff --git a/package.json b/package.json index 5b0f91922d07..de462faff8a7 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "codecov": "^3.0.0", "debug": "^3.0.1", "eslint": "^4.19.1", + "eslint-config-fbjs": "^2.0.1", "eslint-config-prettier": "^2.9.0", "eslint-plugin-babel": "^5.1.0", "eslint-plugin-flowtype": "^2.35.0", diff --git a/packages/jest-jasmine2/src/jasmine/Env.js b/packages/jest-jasmine2/src/jasmine/Env.js index d547c0a8f271..28c69b148387 100644 --- a/packages/jest-jasmine2/src/jasmine/Env.js +++ b/packages/jest-jasmine2/src/jasmine/Env.js @@ -92,7 +92,9 @@ export default function(j$) { }; const defaultResourcesForRunnable = function(id, parentRunnableId) { - const resources = {spies: []}; + const resources = { + spies: [], + }; runnableResources[id] = resources; }; @@ -258,7 +260,9 @@ export default function(j$) { suite.parentSuite && suite.parentSuite.id, ); if (suite === topSuite) { - reporter.jasmineStarted({totalSpecsDefined}); + reporter.jasmineStarted({ + totalSpecsDefined, + }); } else { reporter.suiteStarted(suite.result); } @@ -549,7 +553,12 @@ export default function(j$) { this.fail = function(error) { const {isError, message} = checkIsError(error); - currentRunnable().addExpectationResult(false, { + const runnable = currentRunnable(); + if (!runnable) { + throw new Error('Caught error after test environment was torn down'); + } + + runnable.addExpectationResult(false, { matcherName: '', passed: false, expected: '',