fix: review nits

jestjs · Dec 3, 2020 · 7c73368 · 7c73368
1 parent c9ecf36
commit 7c73368
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 21 deletions.
diff --git a/e2e/__tests__/babelPluginJestDeadlines.test.ts b/e2e/__tests__/babelPluginJestDeadlines.test.ts
@@ -12,7 +12,7 @@ import runJest from '../runJest';
 
 const DIR = path.resolve(__dirname, '..', 'babel-plugin-jest-deadlines');
 
-beforeEach(() => {
+beforeAll(() => {
   runYarnInstall(DIR);
 });
 

diff --git a/packages/babel-plugin-jest-deadlines/package.json b/packages/babel-plugin-jest-deadlines/package.json
@@ -17,19 +17,15 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@babel/template": "^7.3.3",
     "@babel/types": "^7.3.3",
-    "@types/babel__core": "^7.0.0",
-    "@types/babel__traverse": "^7.0.6"
+    "@types/babel__core": "^7.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
     "@babel/preset-react": "^7.12.1",
     "@types/babel__template": "^7.0.2",
     "@types/node": "*",
-    "@types/prettier": "^2.0.0",
-    "babel-plugin-tester": "^10.0.0",
-    "prettier": "^2.1.1"
+    "babel-plugin-tester": "^10.0.0"
   },
   "publishConfig": {
     "access": "public"

diff --git a/...ages/babel-plugin-jest-deadlines/src/__tests__/__snapshots__/deadlinesPlugin.test.ts.snap b/...ages/babel-plugin-jest-deadlines/src/__tests__/__snapshots__/deadlinesPlugin.test.ts.snap
@@ -3,8 +3,8 @@
 exports[`babel-plugin-jest-deadlines bare function call in statement context: bare function call in statement context 1`] = `
 
 async function foo() {
-        await bar();
-      }
+  await bar();
+}
 
       ↓ ↓ ↓ ↓ ↓ ↓
 

diff --git a/packages/babel-plugin-jest-deadlines/src/__tests__/deadlinesPlugin.test.ts b/packages/babel-plugin-jest-deadlines/src/__tests__/deadlinesPlugin.test.ts
@@ -17,9 +17,10 @@ pluginTester({
   tests: {
     'bare function call in statement context': {
       // language=JavaScript
-      code: `async function foo() {
-        await bar();
-      }`,
+      code: `
+        async function foo() {
+          await bar();
+        }`,
       snapshot: true,
     },
     'transforms an expression': {

diff --git a/packages/babel-plugin-jest-deadlines/src/index.ts b/packages/babel-plugin-jest-deadlines/src/index.ts
@@ -7,15 +7,12 @@
  */
 
 import type {PluginObj, types as babelTypes} from '@babel/core';
-import type {Identifier} from '@babel/types';
 
 export default ({
   types: t,
 }: {
   types: typeof babelTypes;
 }): PluginObj<{
-  declareJestObjGetterIdentifier: () => Identifier;
-  jestObjGetterIdentifier?: Identifier;
 }> => ({
   visitor: {
     AwaitExpression(path) {

diff --git a/packages/expect/src/index.ts b/packages/expect/src/index.ts
@@ -412,6 +412,7 @@ setMatchers(spyMatchers, true, expect as Expect);
 setMatchers(toThrowMatchers, true, expect as Expect);
 
 expect.addSnapshotSerializer = () => void 0;
+expect.withinDeadline = async () => { throw new Error('withinDeadline must be implemented by the runtime'); }
 expect.assertions = assertions;
 expect.hasAssertions = hasAssertions;
 expect.getState = getState;

diff --git a/packages/jest-circus/src/deadlineTimeout.ts b/packages/jest-circus/src/deadlineTimeout.ts
@@ -13,14 +13,15 @@ function isUs(line: string): boolean {
 }
 
 async function timeout<T>(promise: Promise<T>, ms: number): Promise<T> {
-  let timeoutId;
+  let timeoutId: ReturnType<typeof setTimeout> | undefined;
   try {
     return await Promise.race([
       promise,
       (async () => {
         await new Promise(resolve => {
           timeoutId = setTimeout(resolve, ms);
         });
+        timeoutId = undefined;
         const here = new Error(`deadline exceeded (waited here for ${ms}ms)`);
         here.stack = here.stack
           ?.split('\n')
@@ -30,6 +31,8 @@ async function timeout<T>(promise: Promise<T>, ms: number): Promise<T> {
       })(),
     ]);
   } finally {
-    clearTimeout(timeoutId);
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -4882,15 +4882,11 @@ __metadata:
   dependencies:
     "@babel/core": ^7.11.6
     "@babel/preset-react": ^7.12.1
-    "@babel/template": ^7.3.3
     "@babel/types": ^7.3.3
     "@types/babel__core": ^7.0.0
     "@types/babel__template": ^7.0.2
-    "@types/babel__traverse": ^7.0.6
     "@types/node": "*"
-    "@types/prettier": ^2.0.0
     babel-plugin-tester: ^10.0.0
-    prettier: ^2.1.1
   languageName: unknown
   linkType: soft