Add each to jest-cirucs

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ### Chore & Maintenance
 
+* `[jest-circus]` Add dependency on jest-each ([#6309](https://github.com/facebook/jest/pull/#6309))
 * `[jest-jasemine2]` Add dependency on jest-each ([#6308](https://github.com/facebook/jest/pull/#6308))
 * `[jest-each]` Move jest-each into core Jest ([#6278](https://github.com/facebook/jest/pull/6278))
 

integration-tests/__tests__/__snapshots__/each.test.js.snap

@@ -1,5 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`runs only the describe.only.each tests 1`] = `
+"PASS __tests__/describe-only.test.js
+  passes all rows expected true == true
+    ✓ passes
+    ✓ passes
+  fails all rows expected false == true
+    ○ skipped 1 test
+
+"
+`;
+
 exports[`shows error message when not enough arguments are supplied to tests 1`] = `
 "FAIL __tests__/each-exception.test.js
   ✕ throws exception when not enough arguments are supplied $left == $right
@@ -41,6 +52,8 @@ exports[`shows only the tests without .skip as being ran 1`] = `
   ✓ passes one row expected true == true
   ✓ passes one row expected true == true
   ○ skipped 4 tests
+  passes all rows expected true == true
+    ○ skipped 2 tests
 
 "
 `;

integration-tests/__tests__/each.test.js

@@ -14,10 +14,8 @@ const runJest = require('../runJest');
 const {extractSummary} = require('../Utils');
 const dir = path.resolve(__dirname, '../each');
 const SkipOnWindows = require('../../scripts/SkipOnWindows');
-const SkipOnJestCircus = require('../../scripts/SkipOnJestCircus');
 
 SkipOnWindows.suite();
-SkipOnJestCircus.suite();
 
 test('works with passing tests', () => {
   const result = runJest(dir, ['success.test.js']);
@@ -50,7 +48,14 @@ test('shows only the tests with .only as being ran', () => {
 
 test('shows only the tests without .skip as being ran', () => {
   const result = runJest(dir, ['each-skip.test.js']);
+  const {rest} = extractSummary(result.stderr);
+  expect(rest).toMatchSnapshot();
   expect(result.status).toBe(0);
+});
+
+test('runs only the describe.only.each tests', () => {
+  const result = runJest(dir, ['describe-only.test.js']);
   const {rest} = extractSummary(result.stderr);
   expect(rest).toMatchSnapshot();
+  expect(result.status).toBe(0);
 });

integration-tests/each/__tests__/describe-only.test.js

@@ -0,0 +1,26 @@
+/**
+ * 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.only.each([[true, true], [true, true]])(
+  'passes all rows expected %s == %s',
+  (left, right) => {
+    it('passes', () => {
+      expect(left).toBe(right);
+    });
+  }
+);
+
+// This failing tests should never because of the above `only` so the suite
+// should pass
+describe.each([[false, true]])(
+  'fails all rows expected %s == %s',
+  (left, right) => {
+    it('fails', () => {
+      expect(left).toBe(right);
+    });
+  }
+);

integration-tests/each/__tests__/each-skip.test.js

@@ -37,3 +37,12 @@ it.skip.each`
     expect(left).toBe(right);
   }
 );
+
+describe.skip.each([[true, true], [true, true]])(
+  'passes all rows expected %s == %s',
+  (left, right) => {
+    it('passes', () => {
+      expect(left).toBe(right);
+    });
+  }
+);

packages/jest-circus/package.json

@@ -13,6 +13,7 @@
     "expect": "^23.0.0",
     "is-generator-fn": "^1.0.0",
     "jest-diff": "^23.0.0",
+    "jest-each": "^23.0.0",
     "jest-matcher-utils": "^23.0.0",
     "jest-message-util": "^23.0.0",
     "jest-snapshot": "^23.0.0",

packages/jest-circus/src/index.js

@@ -16,6 +16,7 @@ import type {
   BlockName,
   TestName,
 } from 'types/Circus';
+import {bind as bindEach} from 'jest-each';
 import {dispatch} from './state';
 
 type THook = (fn: HookFn, timeout?: number) => void;
@@ -105,6 +106,14 @@ test.only = (testName: TestName, fn: TestFn, timeout?: number) => {
   });
 };
 
+test.each = bindEach(test);
+test.only.each = bindEach(test.only);
+test.skip.each = bindEach(test.skip);
+
+describe.each = bindEach(describe);
+describe.only.each = bindEach(describe.only);
+describe.skip.each = bindEach(describe.skip);
+
 module.exports = {
   afterAll,
   afterEach,

packages/jest-each/README.md

@@ -72,7 +72,9 @@ jest-each is a default export so it can be imported with whatever name you like.
 ```js
 // es6
 import each from 'jest-each';
+```
 
+```js
 // es5
 const each = require('jest-each');
 ```

packages/jest-each/src/index.js

@@ -1,16 +1,25 @@
+/**
+ * Copyright (c) 2014-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
+ */
+
 import bind from './bind';
 import arrayEach from './array';
 import templateEach from './template';
 
-const each = (...args) => {
+const each = (...args: any) => {
   if (args.length > 1) {
     return templateEach(global)(...args);
   }
 
   return arrayEach(global)(...args);
 };
 
-each.withGlobal = g => (...args) => {
+each.withGlobal = g => (...args: any) => {
   if (args.length > 1) {
     return templateEach(g)(...args);
   }