From 62a5d1d10f2d5f1413027ff5bf2668ed099d1611 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sat, 26 May 2018 19:45:21 +0100
Subject: [PATCH 1/8] [Jest Circus] Make hooks in empty describe blocks error

Fixes #6293
---
 .../empty-describe-with-hooks.test.js.snap    | 142 ++++++++++++++++++
 .../empty-describe-with-hooks.test.js         |  36 +++++
 .../__tests__/hook-in-empty-describe.test.js  |  14 ++
 .../hook-in-empty-nested-describe.test.js     |  15 ++
 .../multiple-hooks-in-empty-describe.test.js  |  17 +++
 .../empty-describe-with-hooks/package.json    |   5 +
 .../__snapshots__/after_all-test.js.snap      |  57 +++++++
 .../src/__tests__/after_all-test.js           |  30 ++++
 packages/jest-circus/src/event_handler.js     |  11 ++
 .../jest_adapter_init.js                      |   4 +-
 packages/jest-circus/src/utils.js             |   4 +
 11 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
 create mode 100644 integration-tests/__tests__/empty-describe-with-hooks.test.js
 create mode 100644 integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js
 create mode 100644 integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js
 create mode 100644 integration-tests/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js
 create mode 100644 integration-tests/empty-describe-with-hooks/package.json

diff --git a/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap b/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
new file mode 100644
index 000000000000..c308e8d5f692
--- /dev/null
+++ b/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
@@ -0,0 +1,142 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`hook in empty describe 1`] = `
+Object {
+  "rest": "FAIL __tests__/hook-in-empty-describe.test.js
+
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+
+       7 | 
+       8 | describe('a block', () => {
+    >  9 |   beforeEach(() => {});
+         |   ^
+      10 | });
+      11 | 
+      12 | describe('another block with tests', () => {
+
+      at packages/jest-circus/build/index.js:33:17
+      at __tests__/hook-in-empty-describe.test.js:9:3
+      at __tests__/hook-in-empty-describe.test.js:8:1
+
+",
+  "summary": "Test Suites: 1 failed, 1 total
+Tests:       1 passed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /hook-in-empty-describe.test.js/i.
+",
+}
+`;
+
+exports[`hook in empty nested describe 1`] = `
+Object {
+  "rest": "FAIL __tests__/hook-in-empty-nested-describe.test.js
+
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+
+       7 | 
+       8 | describe('a block', () => {
+    >  9 |   beforeEach(() => {});
+         |   ^
+      10 |   describe('another block', () => {});
+      11 | });
+      12 | 
+
+      at packages/jest-circus/build/index.js:33:17
+      at __tests__/hook-in-empty-nested-describe.test.js:9:3
+      at __tests__/hook-in-empty-nested-describe.test.js:8:1
+
+",
+  "summary": "Test Suites: 1 failed, 1 total
+Tests:       1 passed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /hook-in-empty-nested-describe.test.js/i.
+",
+}
+`;
+
+exports[`multiple hooks in empty describe 1`] = `
+Object {
+  "rest": "FAIL __tests__/multiple-hooks-in-empty-describe.test.js
+
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+
+       7 | 
+       8 | describe('a block', () => {
+    >  9 |   beforeEach(() => {});
+         |   ^
+      10 |   afterEach(() => {});
+      11 |   afterAll(() => {});
+      12 |   beforeAll(() => {});
+
+      at packages/jest-circus/build/index.js:33:17
+      at __tests__/multiple-hooks-in-empty-describe.test.js:9:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: afterEach() in a describe block with no tests.\\"
+
+       8 | describe('a block', () => {
+       9 |   beforeEach(() => {});
+    > 10 |   afterEach(() => {});
+         |   ^
+      11 |   afterAll(() => {});
+      12 |   beforeAll(() => {});
+      13 | });
+
+      at packages/jest-circus/build/index.js:33:17
+      at __tests__/multiple-hooks-in-empty-describe.test.js:10:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: afterAll() in a describe block with no tests.\\"
+
+       9 |   beforeEach(() => {});
+      10 |   afterEach(() => {});
+    > 11 |   afterAll(() => {});
+         |   ^
+      12 |   beforeAll(() => {});
+      13 | });
+      14 | 
+
+      at packages/jest-circus/build/index.js:33:17
+      at __tests__/multiple-hooks-in-empty-describe.test.js:11:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeAll() in a describe block with no tests.\\"
+
+      10 |   afterEach(() => {});
+      11 |   afterAll(() => {});
+    > 12 |   beforeAll(() => {});
+         |   ^
+      13 | });
+      14 | 
+      15 | describe('another block with tests', () => {
+
+      at packages/jest-circus/build/index.js:33:17
+      at __tests__/multiple-hooks-in-empty-describe.test.js:12:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+",
+  "summary": "Test Suites: 1 failed, 1 total
+Tests:       1 passed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /multiple-hooks-in-empty-describe.test.js/i.
+",
+}
+`;
diff --git a/integration-tests/__tests__/empty-describe-with-hooks.test.js b/integration-tests/__tests__/empty-describe-with-hooks.test.js
new file mode 100644
index 000000000000..c283ff56dfe6
--- /dev/null
+++ b/integration-tests/__tests__/empty-describe-with-hooks.test.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2018-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ */
+
+'use strict';
+
+const path = require('path');
+const runJest = require('../runJest');
+const {extractSummary} = require('../Utils');
+const dir = path.resolve(__dirname, '../empty-describe-with-hooks');
+const ConditionalTest = require('../../scripts/ConditionalTest');
+
+ConditionalTest.skipSuiteOnJasmine();
+
+test('hook in empty describe', () => {
+  const result = runJest(dir, ['hook-in-empty-describe.test.js']);
+  expect(result.status).toBe(1);
+  expect(extractSummary(result.stderr)).toMatchSnapshot();
+});
+
+test('hook in empty nested describe', () => {
+  const result = runJest(dir, ['hook-in-empty-nested-describe.test.js']);
+  expect(result.status).toBe(1);
+  expect(extractSummary(result.stderr)).toMatchSnapshot();
+});
+
+test('multiple hooks in empty describe', () => {
+  const result = runJest(dir, ['multiple-hooks-in-empty-describe.test.js']);
+  expect(result.status).toBe(1);
+  expect(extractSummary(result.stderr)).toMatchSnapshot();
+});
diff --git a/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js b/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js
new file mode 100644
index 000000000000..326c05104438
--- /dev/null
+++ b/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) 2018-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+describe('a block', () => {
+  beforeEach(() => {});
+});
+
+describe('another block with tests', () => {
+  test('this test prevents us from failing due to zero tests', () => {});
+});
diff --git a/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js b/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js
new file mode 100644
index 000000000000..ec2b26f3b61f
--- /dev/null
+++ b/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) 2018-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+describe('a block', () => {
+  beforeEach(() => {});
+  describe('another block', () => {});
+});
+
+describe('another block with tests', () => {
+  test('this test prevents us from failing due to zero tests', () => {});
+});
diff --git a/integration-tests/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js b/integration-tests/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js
new file mode 100644
index 000000000000..76cdfc1ef283
--- /dev/null
+++ b/integration-tests/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2018-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+describe('a block', () => {
+  beforeEach(() => {});
+  afterEach(() => {});
+  afterAll(() => {});
+  beforeAll(() => {});
+});
+
+describe('another block with tests', () => {
+  test('this test prevents us from failing due to zero tests', () => {});
+});
diff --git a/integration-tests/empty-describe-with-hooks/package.json b/integration-tests/empty-describe-with-hooks/package.json
new file mode 100644
index 000000000000..148788b25446
--- /dev/null
+++ b/integration-tests/empty-describe-with-hooks/package.json
@@ -0,0 +1,5 @@
+{
+  "jest": {
+    "testEnvironment": "node"
+  }
+}
diff --git a/packages/jest-circus/src/__tests__/__snapshots__/after_all-test.js.snap b/packages/jest-circus/src/__tests__/__snapshots__/after_all-test.js.snap
index 62f1c5843d32..0aefc958dd83 100644
--- a/packages/jest-circus/src/__tests__/__snapshots__/after_all-test.js.snap
+++ b/packages/jest-circus/src/__tests__/__snapshots__/after_all-test.js.snap
@@ -1,5 +1,62 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`describe block _can_ have hooks if a child describe block has tests 1`] = `
+"start_describe_definition: describe
+add_hook: afterEach
+add_hook: beforeEach
+add_hook: afterAll
+add_hook: beforeAll
+start_describe_definition: child describe
+add_test: my test
+finish_describe_definition: child describe
+finish_describe_definition: describe
+run_start
+run_describe_start: ROOT_DESCRIBE_BLOCK
+run_describe_start: describe
+hook_start: beforeAll
+hook_success: beforeAll
+run_describe_start: child describe
+test_start: my test
+hook_start: beforeEach
+hook_success: beforeEach
+test_fn_start: my test
+test_fn_failure: my test
+hook_start: afterEach
+hook_success: afterEach
+test_done: my test
+run_describe_finish: child describe
+hook_start: afterAll
+hook_success: afterAll
+run_describe_finish: describe
+run_describe_finish: ROOT_DESCRIBE_BLOCK
+run_finish
+
+unhandledErrors: 0
+"
+`;
+
+exports[`describe block cannot have hooks and no tests 1`] = `
+"start_describe_definition: describe
+add_hook: afterEach
+add_hook: beforeEach
+add_hook: afterAll
+add_hook: beforeAll
+finish_describe_definition: describe
+run_start
+run_describe_start: ROOT_DESCRIBE_BLOCK
+run_describe_start: describe
+hook_start: beforeAll
+hook_success: beforeAll
+hook_start: afterAll
+hook_success: afterAll
+run_describe_finish: describe
+run_describe_finish: ROOT_DESCRIBE_BLOCK
+run_finish
+
+unhandledErrors: 4
+"
+`;
+
 exports[`tests are not marked done until their parent afterAll runs 1`] = `
 "start_describe_definition: describe
 add_hook: afterAll
diff --git a/packages/jest-circus/src/__tests__/after_all-test.js b/packages/jest-circus/src/__tests__/after_all-test.js
index c802a0b479fa..956348e4510c 100644
--- a/packages/jest-circus/src/__tests__/after_all-test.js
+++ b/packages/jest-circus/src/__tests__/after_all-test.js
@@ -37,3 +37,33 @@ test('tests are not marked done until their parent afterAll runs', () => {
 
   expect(stdout).toMatchSnapshot();
 });
+
+test('describe block cannot have hooks and no tests', () => {
+  const result = runTest(`
+    describe('describe', () => {
+      afterEach(() => {});
+      beforeEach(() => {});
+      afterAll(() => {});
+      beforeAll(() => {});
+    })
+  `);
+
+  expect(result.stdout).toMatchSnapshot();
+});
+
+test('describe block _can_ have hooks if a child describe block has tests', () => {
+  const result = runTest(`
+    describe('describe', () => {
+      afterEach(() => {});
+      beforeEach(() => {});
+      afterAll(() => {});
+      beforeAll(() => {});
+      describe('child describe', () => {
+        test('my test', () => {
+          expect(true).toBe(true);
+        })
+      })
+    })
+  `);
+  expect(result.stdout).toMatchSnapshot();
+});
diff --git a/packages/jest-circus/src/event_handler.js b/packages/jest-circus/src/event_handler.js
index f22d1b2c820d..669596516f42 100644
--- a/packages/jest-circus/src/event_handler.js
+++ b/packages/jest-circus/src/event_handler.js
@@ -15,6 +15,7 @@ import {
   getTestDuration,
   invariant,
   makeTest,
+  describeBlockHasTests,
 } from './utils';
 import {
   injectGlobalErrorHandlers,
@@ -44,6 +45,16 @@ const handler: EventHandler = (event, state): void => {
     case 'finish_describe_definition': {
       const {currentDescribeBlock} = state;
       invariant(currentDescribeBlock, `currentDescribeBlock must be there`);
+
+      if (!describeBlockHasTests(currentDescribeBlock)) {
+        currentDescribeBlock.hooks.forEach(hook => {
+          state.unhandledErrors.push([
+            `Invalid: ${hook.type}() in a describe block with no tests.`,
+            hook.asyncError,
+          ]);
+        });
+      }
+
       if (currentDescribeBlock.parent) {
         state.currentDescribeBlock = currentDescribeBlock.parent;
       }
diff --git a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js
index 990bf18d8479..6a1e50f8614a 100644
--- a/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js
+++ b/packages/jest-circus/src/legacy_code_todo_rewrite/jest_adapter_init.js
@@ -160,7 +160,9 @@ export const runAndTransformResultsToJestFormat = async ({
     failureMessage =
       (failureMessage || '') +
       '\n\n' +
-      formatExecError(testExecError, config, globalConfig);
+      runResult.unhandledErrors
+        .map(err => formatExecError(err, config, globalConfig))
+        .join('\n');
   }
 
   dispatch({name: 'teardown'});
diff --git a/packages/jest-circus/src/utils.js b/packages/jest-circus/src/utils.js
index 1c6618a1711b..9d02fb0d0a1a 100644
--- a/packages/jest-circus/src/utils.js
+++ b/packages/jest-circus/src/utils.js
@@ -131,6 +131,10 @@ export const getEachHooksForTest = (
   return result;
 };
 
+export const describeBlockHasTests = (describe: DescribeBlock) => {
+  return describe.tests.length || describe.children.some(describeBlockHasTests);
+}
+
 const _makeTimeoutMessage = (timeout, isHook) =>
   `Exceeded timeout of ${timeout}ms for a ${
     isHook ? 'hook' : 'test'

From 78b55cfe014aea7e65dea755f10fa019847393e1 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sun, 27 May 2018 22:54:29 +0100
Subject: [PATCH 2/8] Prettier

---
 packages/jest-circus/src/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/jest-circus/src/utils.js b/packages/jest-circus/src/utils.js
index 9d02fb0d0a1a..7d3dd4c7213b 100644
--- a/packages/jest-circus/src/utils.js
+++ b/packages/jest-circus/src/utils.js
@@ -133,7 +133,7 @@ export const getEachHooksForTest = (
 
 export const describeBlockHasTests = (describe: DescribeBlock) => {
   return describe.tests.length || describe.children.some(describeBlockHasTests);
-}
+};
 
 const _makeTimeoutMessage = (timeout, isHook) =>
   `Exceeded timeout of ${timeout}ms for a ${

From 559927880bd3be9b25ba842778659746c0404ce3 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sun, 27 May 2018 23:59:47 +0100
Subject: [PATCH 3/8] Document hooks in empty describe blocks in CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 462b3dc2222b..1e3605798a4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Features
 
 * `[jest-watch]` create new package `jest-watch` to ease custom watch plugin development ([#6318](https://github.com/facebook/jest/pull/6318))
+* `[jest-circus]` Make hooks in empty describe blocks error ([#6320](https://github.com/facebook/jest/pull/6320))
 
 ### Fixes
 

From 4d7aa3f1fbea36dd00302980b32550853f6b1b64 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Sun, 27 May 2018 23:23:58 +0100
Subject: [PATCH 4/8] Trim stack trace for hooks in empty describe blocks

---
 .../empty-describe-with-hooks.test.js.snap    |  6 -----
 packages/jest-circus/src/index.js             | 23 ++++++++++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap b/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
index c308e8d5f692..500475fed574 100644
--- a/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
+++ b/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
@@ -17,7 +17,6 @@ Object {
       11 | 
       12 | describe('another block with tests', () => {
 
-      at packages/jest-circus/build/index.js:33:17
       at __tests__/hook-in-empty-describe.test.js:9:3
       at __tests__/hook-in-empty-describe.test.js:8:1
 
@@ -48,7 +47,6 @@ Object {
       11 | });
       12 | 
 
-      at packages/jest-circus/build/index.js:33:17
       at __tests__/hook-in-empty-nested-describe.test.js:9:3
       at __tests__/hook-in-empty-nested-describe.test.js:8:1
 
@@ -79,7 +77,6 @@ Object {
       11 |   afterAll(() => {});
       12 |   beforeAll(() => {});
 
-      at packages/jest-circus/build/index.js:33:17
       at __tests__/multiple-hooks-in-empty-describe.test.js:9:3
       at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
 
@@ -95,7 +92,6 @@ Object {
       12 |   beforeAll(() => {});
       13 | });
 
-      at packages/jest-circus/build/index.js:33:17
       at __tests__/multiple-hooks-in-empty-describe.test.js:10:3
       at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
 
@@ -111,7 +107,6 @@ Object {
       13 | });
       14 | 
 
-      at packages/jest-circus/build/index.js:33:17
       at __tests__/multiple-hooks-in-empty-describe.test.js:11:3
       at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
 
@@ -127,7 +122,6 @@ Object {
       14 | 
       15 | describe('another block with tests', () => {
 
-      at packages/jest-circus/build/index.js:33:17
       at __tests__/multiple-hooks-in-empty-describe.test.js:12:3
       at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
 
diff --git a/packages/jest-circus/src/index.js b/packages/jest-circus/src/index.js
index d933476ea460..0cc9e98e82ce 100644
--- a/packages/jest-circus/src/index.js
+++ b/packages/jest-circus/src/index.js
@@ -38,12 +38,23 @@ const _dispatchDescribe = (blockFn, blockName, mode?: BlockMode) => {
   dispatch({blockName, mode, name: 'finish_describe_definition'});
 };
 
-const _addHook = (fn: HookFn, hookType: HookType, timeout: ?number) =>
-  dispatch({asyncError: new Error(), fn, hookType, name: 'add_hook', timeout});
-const beforeEach: THook = (fn, timeout) => _addHook(fn, 'beforeEach', timeout);
-const beforeAll: THook = (fn, timeout) => _addHook(fn, 'beforeAll', timeout);
-const afterEach: THook = (fn, timeout) => _addHook(fn, 'afterEach', timeout);
-const afterAll: THook = (fn, timeout) => _addHook(fn, 'afterAll', timeout);
+const _addHook = (fn: HookFn, hookType: HookType, hookFn, timeout: ?number) => {
+  const asyncError = new Error();
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(asyncError, hookFn);
+  }
+  dispatch({asyncError, fn, hookType, name: 'add_hook', timeout});
+};
+
+// Hooks have to pass themselves to the HOF in order for us to trim stack traces.
+const beforeEach: THook = (fn, timeout) =>
+  _addHook(fn, 'beforeEach', beforeEach, timeout);
+const beforeAll: THook = (fn, timeout) =>
+  _addHook(fn, 'beforeAll', beforeAll, timeout);
+const afterEach: THook = (fn, timeout) =>
+  _addHook(fn, 'afterEach', afterEach, timeout);
+const afterAll: THook = (fn, timeout) =>
+  _addHook(fn, 'afterAll', afterAll, timeout);
 
 const test = (testName: TestName, fn: TestFn, timeout?: number) => {
   if (typeof testName !== 'string') {

From 8007555ed437ab42dd6869dca695b48fed9ae368 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 28 May 2018 00:06:46 +0100
Subject: [PATCH 5/8] Move to e2e

---
 .../empty-describe-with-hooks.test.js         |   0
 .../__tests__/hook-in-empty-describe.test.js  |   0
 .../hook-in-empty-nested-describe.test.js     |   0
 .../multiple-hooks-in-empty-describe.test.js  |   0
 .../empty-describe-with-hooks/package.json    |   0
 .../empty-describe-with-hooks.test.js.snap    | 136 ------------------
 6 files changed, 136 deletions(-)
 rename {integration-tests => e2e}/__tests__/empty-describe-with-hooks.test.js (100%)
 rename {integration-tests => e2e}/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js (100%)
 rename {integration-tests => e2e}/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js (100%)
 rename {integration-tests => e2e}/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js (100%)
 rename {integration-tests => e2e}/empty-describe-with-hooks/package.json (100%)
 delete mode 100644 integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap

diff --git a/integration-tests/__tests__/empty-describe-with-hooks.test.js b/e2e/__tests__/empty-describe-with-hooks.test.js
similarity index 100%
rename from integration-tests/__tests__/empty-describe-with-hooks.test.js
rename to e2e/__tests__/empty-describe-with-hooks.test.js
diff --git a/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js b/e2e/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js
similarity index 100%
rename from integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js
rename to e2e/empty-describe-with-hooks/__tests__/hook-in-empty-describe.test.js
diff --git a/integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js b/e2e/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js
similarity index 100%
rename from integration-tests/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js
rename to e2e/empty-describe-with-hooks/__tests__/hook-in-empty-nested-describe.test.js
diff --git a/integration-tests/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js b/e2e/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js
similarity index 100%
rename from integration-tests/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js
rename to e2e/empty-describe-with-hooks/__tests__/multiple-hooks-in-empty-describe.test.js
diff --git a/integration-tests/empty-describe-with-hooks/package.json b/e2e/empty-describe-with-hooks/package.json
similarity index 100%
rename from integration-tests/empty-describe-with-hooks/package.json
rename to e2e/empty-describe-with-hooks/package.json
diff --git a/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap b/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
deleted file mode 100644
index 500475fed574..000000000000
--- a/integration-tests/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
+++ /dev/null
@@ -1,136 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`hook in empty describe 1`] = `
-Object {
-  "rest": "FAIL __tests__/hook-in-empty-describe.test.js
-
-
-  ● Test suite failed to run
-
-    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
-
-       7 | 
-       8 | describe('a block', () => {
-    >  9 |   beforeEach(() => {});
-         |   ^
-      10 | });
-      11 | 
-      12 | describe('another block with tests', () => {
-
-      at __tests__/hook-in-empty-describe.test.js:9:3
-      at __tests__/hook-in-empty-describe.test.js:8:1
-
-",
-  "summary": "Test Suites: 1 failed, 1 total
-Tests:       1 passed, 1 total
-Snapshots:   0 total
-Time:        <<REPLACED>>
-Ran all test suites matching /hook-in-empty-describe.test.js/i.
-",
-}
-`;
-
-exports[`hook in empty nested describe 1`] = `
-Object {
-  "rest": "FAIL __tests__/hook-in-empty-nested-describe.test.js
-
-
-  ● Test suite failed to run
-
-    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
-
-       7 | 
-       8 | describe('a block', () => {
-    >  9 |   beforeEach(() => {});
-         |   ^
-      10 |   describe('another block', () => {});
-      11 | });
-      12 | 
-
-      at __tests__/hook-in-empty-nested-describe.test.js:9:3
-      at __tests__/hook-in-empty-nested-describe.test.js:8:1
-
-",
-  "summary": "Test Suites: 1 failed, 1 total
-Tests:       1 passed, 1 total
-Snapshots:   0 total
-Time:        <<REPLACED>>
-Ran all test suites matching /hook-in-empty-nested-describe.test.js/i.
-",
-}
-`;
-
-exports[`multiple hooks in empty describe 1`] = `
-Object {
-  "rest": "FAIL __tests__/multiple-hooks-in-empty-describe.test.js
-
-
-  ● Test suite failed to run
-
-    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
-
-       7 | 
-       8 | describe('a block', () => {
-    >  9 |   beforeEach(() => {});
-         |   ^
-      10 |   afterEach(() => {});
-      11 |   afterAll(() => {});
-      12 |   beforeAll(() => {});
-
-      at __tests__/multiple-hooks-in-empty-describe.test.js:9:3
-      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
-
-  ● Test suite failed to run
-
-    thrown: \\"Invalid: afterEach() in a describe block with no tests.\\"
-
-       8 | describe('a block', () => {
-       9 |   beforeEach(() => {});
-    > 10 |   afterEach(() => {});
-         |   ^
-      11 |   afterAll(() => {});
-      12 |   beforeAll(() => {});
-      13 | });
-
-      at __tests__/multiple-hooks-in-empty-describe.test.js:10:3
-      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
-
-  ● Test suite failed to run
-
-    thrown: \\"Invalid: afterAll() in a describe block with no tests.\\"
-
-       9 |   beforeEach(() => {});
-      10 |   afterEach(() => {});
-    > 11 |   afterAll(() => {});
-         |   ^
-      12 |   beforeAll(() => {});
-      13 | });
-      14 | 
-
-      at __tests__/multiple-hooks-in-empty-describe.test.js:11:3
-      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
-
-  ● Test suite failed to run
-
-    thrown: \\"Invalid: beforeAll() in a describe block with no tests.\\"
-
-      10 |   afterEach(() => {});
-      11 |   afterAll(() => {});
-    > 12 |   beforeAll(() => {});
-         |   ^
-      13 | });
-      14 | 
-      15 | describe('another block with tests', () => {
-
-      at __tests__/multiple-hooks-in-empty-describe.test.js:12:3
-      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
-
-",
-  "summary": "Test Suites: 1 failed, 1 total
-Tests:       1 passed, 1 total
-Snapshots:   0 total
-Time:        <<REPLACED>>
-Ran all test suites matching /multiple-hooks-in-empty-describe.test.js/i.
-",
-}
-`;

From dcfb57601de104d6bb0683281764f9d6cc7749dd Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 28 May 2018 00:15:19 +0100
Subject: [PATCH 6/8] Add missing snapshots

---
 .../empty-describe-with-hooks.test.js.snap    | 136 ++++++++++++++++++
 1 file changed, 136 insertions(+)
 create mode 100644 e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap

diff --git a/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap b/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
new file mode 100644
index 000000000000..500475fed574
--- /dev/null
+++ b/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
@@ -0,0 +1,136 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`hook in empty describe 1`] = `
+Object {
+  "rest": "FAIL __tests__/hook-in-empty-describe.test.js
+
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+
+       7 | 
+       8 | describe('a block', () => {
+    >  9 |   beforeEach(() => {});
+         |   ^
+      10 | });
+      11 | 
+      12 | describe('another block with tests', () => {
+
+      at __tests__/hook-in-empty-describe.test.js:9:3
+      at __tests__/hook-in-empty-describe.test.js:8:1
+
+",
+  "summary": "Test Suites: 1 failed, 1 total
+Tests:       1 passed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /hook-in-empty-describe.test.js/i.
+",
+}
+`;
+
+exports[`hook in empty nested describe 1`] = `
+Object {
+  "rest": "FAIL __tests__/hook-in-empty-nested-describe.test.js
+
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+
+       7 | 
+       8 | describe('a block', () => {
+    >  9 |   beforeEach(() => {});
+         |   ^
+      10 |   describe('another block', () => {});
+      11 | });
+      12 | 
+
+      at __tests__/hook-in-empty-nested-describe.test.js:9:3
+      at __tests__/hook-in-empty-nested-describe.test.js:8:1
+
+",
+  "summary": "Test Suites: 1 failed, 1 total
+Tests:       1 passed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /hook-in-empty-nested-describe.test.js/i.
+",
+}
+`;
+
+exports[`multiple hooks in empty describe 1`] = `
+Object {
+  "rest": "FAIL __tests__/multiple-hooks-in-empty-describe.test.js
+
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+
+       7 | 
+       8 | describe('a block', () => {
+    >  9 |   beforeEach(() => {});
+         |   ^
+      10 |   afterEach(() => {});
+      11 |   afterAll(() => {});
+      12 |   beforeAll(() => {});
+
+      at __tests__/multiple-hooks-in-empty-describe.test.js:9:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: afterEach() in a describe block with no tests.\\"
+
+       8 | describe('a block', () => {
+       9 |   beforeEach(() => {});
+    > 10 |   afterEach(() => {});
+         |   ^
+      11 |   afterAll(() => {});
+      12 |   beforeAll(() => {});
+      13 | });
+
+      at __tests__/multiple-hooks-in-empty-describe.test.js:10:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: afterAll() in a describe block with no tests.\\"
+
+       9 |   beforeEach(() => {});
+      10 |   afterEach(() => {});
+    > 11 |   afterAll(() => {});
+         |   ^
+      12 |   beforeAll(() => {});
+      13 | });
+      14 | 
+
+      at __tests__/multiple-hooks-in-empty-describe.test.js:11:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+  ● Test suite failed to run
+
+    thrown: \\"Invalid: beforeAll() in a describe block with no tests.\\"
+
+      10 |   afterEach(() => {});
+      11 |   afterAll(() => {});
+    > 12 |   beforeAll(() => {});
+         |   ^
+      13 | });
+      14 | 
+      15 | describe('another block with tests', () => {
+
+      at __tests__/multiple-hooks-in-empty-describe.test.js:12:3
+      at __tests__/multiple-hooks-in-empty-describe.test.js:8:1
+
+",
+  "summary": "Test Suites: 1 failed, 1 total
+Tests:       1 passed, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /multiple-hooks-in-empty-describe.test.js/i.
+",
+}
+`;

From 26c090f0945cdbea49c7f6eb55a42c8fb8ceb9bb Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 28 May 2018 00:25:32 +0100
Subject: [PATCH 7/8] Improve error message

---
 .../empty-describe-with-hooks.test.js.snap           | 12 ++++++------
 packages/jest-circus/src/event_handler.js            |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap b/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
index 500475fed574..735f97671258 100644
--- a/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
+++ b/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
@@ -7,7 +7,7 @@ Object {
 
   ● Test suite failed to run
 
-    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+    Invalid: beforeEach() may not be used in a describe block containing no tests.
 
        7 | 
        8 | describe('a block', () => {
@@ -37,7 +37,7 @@ Object {
 
   ● Test suite failed to run
 
-    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+    Invalid: beforeEach() may not be used in a describe block containing no tests.
 
        7 | 
        8 | describe('a block', () => {
@@ -67,7 +67,7 @@ Object {
 
   ● Test suite failed to run
 
-    thrown: \\"Invalid: beforeEach() in a describe block with no tests.\\"
+    Invalid: beforeEach() may not be used in a describe block containing no tests.
 
        7 | 
        8 | describe('a block', () => {
@@ -82,7 +82,7 @@ Object {
 
   ● Test suite failed to run
 
-    thrown: \\"Invalid: afterEach() in a describe block with no tests.\\"
+    Invalid: afterEach() may not be used in a describe block containing no tests.
 
        8 | describe('a block', () => {
        9 |   beforeEach(() => {});
@@ -97,7 +97,7 @@ Object {
 
   ● Test suite failed to run
 
-    thrown: \\"Invalid: afterAll() in a describe block with no tests.\\"
+    Invalid: afterAll() may not be used in a describe block containing no tests.
 
        9 |   beforeEach(() => {});
       10 |   afterEach(() => {});
@@ -112,7 +112,7 @@ Object {
 
   ● Test suite failed to run
 
-    thrown: \\"Invalid: beforeAll() in a describe block with no tests.\\"
+    Invalid: beforeAll() may not be used in a describe block containing no tests.
 
       10 |   afterEach(() => {});
       11 |   afterAll(() => {});
diff --git a/packages/jest-circus/src/event_handler.js b/packages/jest-circus/src/event_handler.js
index 669596516f42..23782bf028e5 100644
--- a/packages/jest-circus/src/event_handler.js
+++ b/packages/jest-circus/src/event_handler.js
@@ -48,10 +48,10 @@ const handler: EventHandler = (event, state): void => {
 
       if (!describeBlockHasTests(currentDescribeBlock)) {
         currentDescribeBlock.hooks.forEach(hook => {
-          state.unhandledErrors.push([
-            `Invalid: ${hook.type}() in a describe block with no tests.`,
-            hook.asyncError,
-          ]);
+          hook.asyncError.message = `Invalid: ${
+            hook.type
+          }() may not be used in a describe block containing no tests.`;
+          state.unhandledErrors.push(hook.asyncError);
         });
       }
 

From dbadab9077a7d9129fbf2d814ea7eb0975683eed Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Mon, 28 May 2018 00:32:04 +0100
Subject: [PATCH 8/8] Add test asserting we can have hooks in blocks with
 skipped tests

---
 .../empty-describe-with-hooks.test.js.snap            | 11 +++++++++++
 e2e/__tests__/empty-describe-with-hooks.test.js       |  6 ++++++
 .../hook-in-describe-with-skipped-test.test.js        | 11 +++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 e2e/empty-describe-with-hooks/__tests__/hook-in-describe-with-skipped-test.test.js

diff --git a/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap b/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
index 735f97671258..6aed70d1a1aa 100644
--- a/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
+++ b/e2e/__tests__/__snapshots__/empty-describe-with-hooks.test.js.snap
@@ -1,5 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`hook in describe with skipped test 1`] = `
+Object {
+  "rest": "",
+  "summary": "Test Suites: 1 skipped, 0 of 1 total
+Tests:       1 skipped, 1 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites matching /hook-in-describe-with-skipped-test.test.js/i.",
+}
+`;
+
 exports[`hook in empty describe 1`] = `
 Object {
   "rest": "FAIL __tests__/hook-in-empty-describe.test.js
diff --git a/e2e/__tests__/empty-describe-with-hooks.test.js b/e2e/__tests__/empty-describe-with-hooks.test.js
index c283ff56dfe6..7a366e3b6bf6 100644
--- a/e2e/__tests__/empty-describe-with-hooks.test.js
+++ b/e2e/__tests__/empty-describe-with-hooks.test.js
@@ -23,6 +23,12 @@ test('hook in empty describe', () => {
   expect(extractSummary(result.stderr)).toMatchSnapshot();
 });
 
+test('hook in describe with skipped test', () => {
+  const result = runJest(dir, ['hook-in-describe-with-skipped-test.test.js']);
+  expect(result.status).toBe(0);
+  expect(extractSummary(result.stderr)).toMatchSnapshot();
+});
+
 test('hook in empty nested describe', () => {
   const result = runJest(dir, ['hook-in-empty-nested-describe.test.js']);
   expect(result.status).toBe(1);
diff --git a/e2e/empty-describe-with-hooks/__tests__/hook-in-describe-with-skipped-test.test.js b/e2e/empty-describe-with-hooks/__tests__/hook-in-describe-with-skipped-test.test.js
new file mode 100644
index 000000000000..c187798a83ef
--- /dev/null
+++ b/e2e/empty-describe-with-hooks/__tests__/hook-in-describe-with-skipped-test.test.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2018-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+describe('a block', () => {
+  beforeEach(() => {});
+  test.skip('skipped test', () => {});
+});