fix: check for second param supplied to describe block

jestjs · May 22, 2018 · dea6999 · dea6999
1 parent 74892f0
commit dea6999
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 2 deletions.
diff --git a/integration-tests/__tests__/__snapshots__/globals.test.js.snap b/integration-tests/__tests__/__snapshots__/globals.test.js.snap
@@ -19,6 +19,32 @@ Time:        <<REPLACED>>
 Ran all test suites."
 `;
 
+exports[`cannot have describe with no implementation 1`] = `
+"FAIL __tests__/only-constructs.test.js
+  ● Test suite failed to run
+
+    Missing second argument. It must be a callback function.
+
+      1 | 
+    > 2 |     describe('describe, no implementation');
+        | ^
+      3 |   
+
+      at packages/jest-jasmine2/build/jasmine/Env.js:<<LINE>>:<<COLUMN>>
+      at __tests__/only-constructs.test.js:<<LINE>>:<<COLUMN>>
+
+"
+`;
+
+exports[`cannot have describe with no implementation 2`] = `
+"Test Suites: 1 failed, 1 total
+Tests:       0 total
+Snapshots:   0 total
+Time:        <<REPLACED>>
+Ran all test suites.
+"
+`;
+
 exports[`cannot test with no implementation 1`] = `
 "FAIL __tests__/only-constructs.test.js
   ● Test suite failed to run

diff --git a/integration-tests/__tests__/globals.test.js b/integration-tests/__tests__/globals.test.js
@@ -116,6 +116,21 @@ test('only', () => {
   expect(summary).toMatchSnapshot();
 });
 
+test('cannot have describe with no implementation', () => {
+  const filename = 'only-constructs.test.js';
+  const content = `
+    describe('describe, no implementation');
+  `;
+
+  writeFiles(TEST_DIR, {[filename]: content});
+  const {stderr, status} = runJest(DIR);
+  expect(status).toBe(1);
+
+  const {summary, rest} = extractSummary(stderr, {stripLocation: true});
+  expect(clean(rest)).toMatchSnapshot();
+  expect(clean(summary)).toMatchSnapshot();
+});
+
 test('cannot test with no implementation', () => {
   const filename = 'only-constructs.test.js';
   const content = `

diff --git a/packages/jest-jasmine2/src/jasmine/Env.js b/packages/jest-jasmine2/src/jasmine/Env.js
@@ -322,6 +322,16 @@ export default function(j$) {
 
     this.describe = function(description, specDefinitions) {
       const suite = suiteFactory(description);
+      if (specDefinitions === undefined) {
+        throw new Error(
+          `Missing second argument supplied to 'describe'. It must be a callback function.`,
+        );
+      }
+      if (typeof specDefinitions !== 'function') {
+        throw new Error(
+          `Invalid second argument supplied to 'describe', ${specDefinitions}. It must be a callback function.`,
+        );
+      }
       if (specDefinitions.length > 0) {
         throw new Error('describe does not expect any arguments');
       }
@@ -450,12 +460,12 @@ export default function(j$) {
       }
       if (fn === undefined) {
         throw new Error(
-          'Missing second argument. It must be a callback function.',
+          `Missing second argument supplied to 'it'. It must be a callback function.`,
         );
       }
       if (typeof fn !== 'function') {
         throw new Error(
-          `Invalid second argument, ${fn}. It must be a callback function.`,
+          `Invalid second argument supplied to 'it', ${fn}. It must be a callback function.`,
         );
       }
       const spec = specFactory(