fix(global_setup|global_teardown): fixed await call, change to TypeEr…

…ror, add path to error
jestjs · Mar 20, 2018 · 87a432c · 87a432c
1 parent a8d0a9f
commit 87a432c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/integration-tests/__tests__/global_setup.test.js b/integration-tests/__tests__/global_setup.test.js
@@ -35,5 +35,8 @@ test('jest throws an error when globalSetup does not export a function', () => {
   ]);
 
   expect(status).toBe(1);
-  expect(stderr).toMatch('Error: globalSetup file must export a function');
+  expect(stderr).toMatch(
+    'TypeError: globalSetup file must export a function at',
+  );
+  expect(stderr).toMatch(setupPath);
 });
diff --git a/integration-tests/__tests__/global_teardown.test.js b/integration-tests/__tests__/global_teardown.test.js
@@ -36,14 +36,17 @@ test('globalTeardown is triggered once after all test suites', () => {
 });
 
 test('jest throws an error when globalTeardown does not export a function', () => {
-  const setupPath = path.resolve(
+  const teardownPath = path.resolve(
     __dirname,
     '../global-teardown/invalid_teardown.js',
   );
   const {status, stderr} = runJest('global-teardown', [
-    `--globalTeardown=${setupPath}`,
+    `--globalTeardown=${teardownPath}`,
   ]);
 
   expect(status).toBe(1);
-  expect(stderr).toMatch('Error: globalTeardown file must export a function');
+  expect(stderr).toMatch(
+    'TypeError: globalTeardown file must export a function at',
+  );
+  expect(stderr).toMatch(teardownPath);
 });
diff --git a/packages/jest-cli/src/run_jest.js b/packages/jest-cli/src/run_jest.js
@@ -202,12 +202,16 @@ export default (async function runJest({
   setConfig(contexts, {cwd: process.cwd()});
   if (globalConfig.globalSetup) {
     // $FlowFixMe
-    const globalSetup = await require(globalConfig.globalSetup);
+    const globalSetup = require(globalConfig.globalSetup);
     if (typeof globalSetup !== 'function') {
-      throw new Error('globalSetup file must export a function');
+      throw new TypeError(
+        `globalSetup file must export a function at ${
+          globalConfig.globalSetup
+        }`,
+      );
     }
 
-    globalSetup();
+    await globalSetup();
   }
   const results = await new TestScheduler(
     globalConfig,
@@ -221,12 +225,16 @@ export default (async function runJest({
 
   if (globalConfig.globalTeardown) {
     // $FlowFixMe
-    const globalTeardown = await require(globalConfig.globalTeardown);
+    const globalTeardown = require(globalConfig.globalTeardown);
     if (typeof globalTeardown !== 'function') {
-      throw new Error('globalTeardown file must export a function');
+      throw new TypeError(
+        `globalTeardown file must export a function at ${
+          globalConfig.globalTeardown
+        }`,
+      );
     }
 
-    globalTeardown();
+    await globalTeardown();
   }
   return processResults(results, {
     isJSON: globalConfig.json,