From 9c052519cade0ab95077656760774c288aaf0e73 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 19:04:32 +0000 Subject: [PATCH 1/8] Fix #8570 --- packages/jest-types/src/Global.ts | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/packages/jest-types/src/Global.ts b/packages/jest-types/src/Global.ts index d237eaa3ef5d..c1971dc210d8 100644 --- a/packages/jest-types/src/Global.ts +++ b/packages/jest-types/src/Global.ts @@ -84,18 +84,3 @@ export interface Global extends NodeJS.Global { spyOnProperty: () => void; } -declare global { - module NodeJS { - interface Global { - it: It; - test: ItConcurrent; - fit: ItBase; - xit: ItBase; - xtest: ItBase; - describe: Describe; - xdescribe: DescribeBase; - fdescribe: DescribeBase; - jasmine: Jasmine; - } - } -} From 74828b9e7158b06c3818fd6cd3e9b147feae4fec Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 19:16:01 +0000 Subject: [PATCH 2/8] fix --- packages/jest-each/src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts index 4ee273bbb596..7f542d10f2e1 100644 --- a/packages/jest-each/src/index.ts +++ b/packages/jest-each/src/index.ts @@ -9,8 +9,7 @@ import {Global} from '@jest/types'; import bind from './bind'; -type Global = NodeJS.Global; - +type Global = Global.Global; const install = ( g: Global, table: Global.EachTable, From f4f2cfe25619a72f5ecab6edd2fc28cdbdfe8aed Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 19:28:19 +0000 Subject: [PATCH 3/8] ifx --- packages/jest-each/package.json | 1 + packages/jest-each/src/index.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/jest-each/package.json b/packages/jest-each/package.json index 0ff3d4ad4178..6a2aede6816e 100644 --- a/packages/jest-each/package.json +++ b/packages/jest-each/package.json @@ -19,6 +19,7 @@ "license": "MIT", "dependencies": { "@jest/types": "^24.8.0", + "@types/node": "*", "chalk": "^2.0.1", "jest-get-type": "^24.8.0", "jest-util": "^24.8.0", diff --git a/packages/jest-each/src/index.ts b/packages/jest-each/src/index.ts index 7f542d10f2e1..016e5f60293c 100644 --- a/packages/jest-each/src/index.ts +++ b/packages/jest-each/src/index.ts @@ -43,7 +43,7 @@ const install = ( }; const each = (table: Global.EachTable, ...data: Global.TemplateData) => - install(global, table, ...data); + install(global as Global, table, ...data); each.withGlobal = (g: Global) => ( table: Global.EachTable, From e556f061f6c097f8cb7f6023148b4eb675accf4c Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 19:36:55 +0000 Subject: [PATCH 4/8] fix --- .../jestAdapterInit.ts | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts index 8f75aba0df63..9804125de04e 100644 --- a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts +++ b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {Circus, Config} from '@jest/types'; +import {Circus, Config, Global} from '@jest/types'; import {JestEnvironment} from '@jest/environment'; import {AssertionResult, Status, TestResult} from '@jest/test-result'; import {extractExpectedAssertionsErrors, getState, setState} from 'expect'; @@ -53,15 +53,16 @@ export const initialize = ({ const mutex = throat(globalConfig.maxConcurrency); - Object.assign(global, globals); + const nodeGlobal = global as Global.Global; + Object.assign(nodeGlobal, globals); - global.xit = global.it.skip; - global.xtest = global.it.skip; - global.xdescribe = global.describe.skip; - global.fit = global.it.only; - global.fdescribe = global.describe.only; + nodeGlobal.xit = nodeGlobal.it.skip; + nodeGlobal.xtest = nodeGlobal.it.skip; + nodeGlobal.xdescribe = nodeGlobal.describe.skip; + nodeGlobal.fit = nodeGlobal.it.only; + nodeGlobal.fdescribe = nodeGlobal.describe.only; - global.test.concurrent = (test => { + nodeGlobal.test.concurrent = (test => { const concurrent = ( testName: string, testFn: () => Promise, @@ -74,7 +75,7 @@ export const initialize = ({ // that will result in this test to be skipped, so we'll be executing the promise function anyway, // even if it ends up being skipped. const promise = mutex(() => testFn()); - global.test(testName, () => promise, timeout); + nodeGlobal.test(testName, () => promise, timeout); }; concurrent.only = ( @@ -90,7 +91,7 @@ export const initialize = ({ concurrent.skip = test.skip; return concurrent; - })(global.test); + })(nodeGlobal.test); addEventHandler(eventHandler); From d564beb653073617fb6550a5fac974ffdff1e78a Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 19:42:47 +0000 Subject: [PATCH 5/8] fix --- packages/jest-jasmine2/src/jestExpect.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/jest-jasmine2/src/jestExpect.ts b/packages/jest-jasmine2/src/jestExpect.ts index 9453f1731638..254e95701de3 100644 --- a/packages/jest-jasmine2/src/jestExpect.ts +++ b/packages/jest-jasmine2/src/jestExpect.ts @@ -6,6 +6,7 @@ */ import expect, {MatcherState} from 'expect'; +import {Global} from '@jest/types'; import { addSerializer, toMatchSnapshot, @@ -15,6 +16,8 @@ import { } from 'jest-snapshot'; import {RawMatcherFn, Jasmine} from './types'; +declare const global: Global.Global; + type JasmineMatcher = { (matchersUtil: any, context: any): JasmineMatcher; compare: () => RawMatcherFn; From 048f93126cfba47b4c9ae96e169c8c6fdb06b5be Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 19:51:49 +0000 Subject: [PATCH 6/8] fix --- packages/jest-jasmine2/src/setup_jest_globals.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/jest-jasmine2/src/setup_jest_globals.ts b/packages/jest-jasmine2/src/setup_jest_globals.ts index 9da4aa850bb9..e66580c8bba6 100644 --- a/packages/jest-jasmine2/src/setup_jest_globals.ts +++ b/packages/jest-jasmine2/src/setup_jest_globals.ts @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import {Config} from '@jest/types'; +import {Config, Global} from '@jest/types'; import {Plugin} from 'pretty-format'; import {extractExpectedAssertionsErrors, getState, setState} from 'expect'; import { @@ -16,6 +16,8 @@ import { import JasmineSpec, {Attributes, SpecResult} from './jasmine/Spec'; import {Jasmine} from './types'; +declare const global: Global.Global; + export type SetupOptions = { config: Config.ProjectConfig; globalConfig: Config.GlobalConfig; From cc686ee5cddd8b4681181f9172f8fe4b4d0ab111 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 20:07:14 +0000 Subject: [PATCH 7/8] Fix --- packages/jest-types/src/Global.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/jest-types/src/Global.ts b/packages/jest-types/src/Global.ts index c1971dc210d8..3203b7533d62 100644 --- a/packages/jest-types/src/Global.ts +++ b/packages/jest-types/src/Global.ts @@ -83,4 +83,3 @@ export interface Global extends NodeJS.Global { spyOn: () => void; spyOnProperty: () => void; } - From add131311509ebe031df7b6c086229d8ae9884f3 Mon Sep 17 00:00:00 2001 From: Andrew Bradley Date: Sat, 15 Jun 2019 21:54:39 +0000 Subject: [PATCH 8/8] fix --- packages/jest-each/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/jest-each/package.json b/packages/jest-each/package.json index 6a2aede6816e..0ff3d4ad4178 100644 --- a/packages/jest-each/package.json +++ b/packages/jest-each/package.json @@ -19,7 +19,6 @@ "license": "MIT", "dependencies": { "@jest/types": "^24.8.0", - "@types/node": "*", "chalk": "^2.0.1", "jest-get-type": "^24.8.0", "jest-util": "^24.8.0",