use getter and setter

jestjs · Dec 6, 2021 · 4d175b4 · 4d175b4
1 parent 2ad75af
commit 4d175b4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/packages/jest-jasmine2/src/index.ts b/packages/jest-jasmine2/src/index.ts
@@ -23,8 +23,6 @@ const JASMINE = require.resolve('./jasmine/jasmineLight');
 
 const jestEachBuildDir = path.dirname(require.resolve('jest-each'));
 
-const testTimeoutSymbol = Symbol.for('TEST_TIMEOUT_SYMBOL');
-
 export default async function jasmine2(
   globalConfig: Config.GlobalConfig,
   config: Config.ProjectConfig,
@@ -132,12 +130,10 @@ export default async function jasmine2(
       configurable: true,
       enumerable: true,
       get() {
-        // @ts-expect-error: https://github.com/Microsoft/TypeScript/issues/24587
-        return environment.global[testTimeoutSymbol];
+        return this._DEFAULT_TIMEOUT_INTERVAL;
       },
       set(value) {
-        // @ts-expect-error: https://github.com/Microsoft/TypeScript/issues/24587
-        environment.global[testTimeoutSymbol] = value;
+        this._DEFAULT_TIMEOUT_INTERVAL = value;
       },
     });
   }

diff --git a/packages/jest-jasmine2/src/jasmine/Env.ts b/packages/jest-jasmine2/src/jasmine/Env.ts
@@ -49,8 +49,6 @@ import type {
 import type {default as Spec, SpecResult} from './Spec';
 import type Suite from './Suite';
 
-const testTimeoutSymbol = Symbol.for('TEST_TIMEOUT_SYMBOL');
-
 export default function (j$: Jasmine) {
   return class Env {
     specFilter: (spec: Spec) => boolean;
@@ -512,7 +510,7 @@ export default function (j$: Jasmine) {
           queueableFn: {
             fn,
             timeout() {
-              return timeout || (global as any)[testTimeoutSymbol];
+              return timeout || j$._DEFAULT_TIMEOUT_INTERVAL;
             },
           },
           throwOnExpectationFailure,
@@ -624,7 +622,7 @@ export default function (j$: Jasmine) {
         currentDeclarationSuite.beforeEach({
           fn: beforeEachFunction,
           timeout() {
-            return timeout || (global as any)[testTimeoutSymbol];
+            return timeout || j$._DEFAULT_TIMEOUT_INTERVAL;
           },
         });
       };
@@ -633,7 +631,7 @@ export default function (j$: Jasmine) {
         currentDeclarationSuite.beforeAll({
           fn: beforeAllFunction,
           timeout() {
-            return timeout || (global as any)[testTimeoutSymbol];
+            return timeout || j$._DEFAULT_TIMEOUT_INTERVAL;
           },
         });
       };
@@ -642,7 +640,7 @@ export default function (j$: Jasmine) {
         currentDeclarationSuite.afterEach({
           fn: afterEachFunction,
           timeout() {
-            return timeout || (global as any)[testTimeoutSymbol];
+            return timeout || j$._DEFAULT_TIMEOUT_INTERVAL;
           },
         });
       };
@@ -651,7 +649,7 @@ export default function (j$: Jasmine) {
         currentDeclarationSuite.afterAll({
           fn: afterAllFunction,
           timeout() {
-            return timeout || (global as any)[testTimeoutSymbol];
+            return timeout || j$._DEFAULT_TIMEOUT_INTERVAL;
           },
         });
       };

diff --git a/packages/jest-jasmine2/src/jasmine/jasmineLight.ts b/packages/jest-jasmine2/src/jasmine/jasmineLight.ts
@@ -45,7 +45,18 @@ const testTimeoutSymbol = Symbol.for('TEST_TIMEOUT_SYMBOL');
 export const create = function (createOptions: Record<string, any>): Jasmine {
   const j$ = {...createOptions} as Jasmine;
 
-  (global as any)[testTimeoutSymbol] = createOptions.testTimeout || 5000;
+  Object.defineProperty(j$, '_DEFAULT_TIMEOUT_INTERVAL', {
+    configurable: true,
+    enumerable: true,
+    get() {
+      return (
+        (global as any)[testTimeoutSymbol] || createOptions.testTimeout || 5000
+      );
+    },
+    set(value) {
+      (global as any)[testTimeoutSymbol] = value;
+    },
+  });
 
   j$.getEnv = function () {
     const env = (j$.currentEnv_ = j$.currentEnv_ || new j$.Env());

diff --git a/packages/jest-jasmine2/src/types.ts b/packages/jest-jasmine2/src/types.ts
@@ -74,6 +74,7 @@ type JasmineMatcher = {
 export type JasmineMatchersObject = {[id: string]: JasmineMatcher};
 
 export type Jasmine = {
+  _DEFAULT_TIMEOUT_INTERVAL: number;
   DEFAULT_TIMEOUT_INTERVAL: number;
   currentEnv_: ReturnType<typeof Env>['prototype'];
   getEnv: () => ReturnType<typeof Env>['prototype'];