Skip to content

Commit

Permalink
fix: properly inject extraGlobals into the environment
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Oct 31, 2020
1 parent f9132f9 commit 4bbaee6
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -15,6 +15,7 @@
- `[jest-resolve-dependencies]` Resolve mocks as dependencies ([#10713](https://github.com/facebook/jest/pull/10713))
- `[jest-runtime]` Handle file URLs in dynamic imports ([#10744](https://github.com/facebook/jest/pull/10744))
- `[jest-runtime, babel-jest]` Pass more ESM options to `@jest/transform` ([#10752](https://github.com/facebook/jest/pull/10752))
- `[jest-runtime]` Properly inject `extraGlobals` into the runtime ([#10758](https://github.com/facebook/jest/pull/10758))
- `[jest-transform]` Link to ESM docs on syntax errors ([#10748](https://github.com/facebook/jest/pull/10748))

### Chore & Maintenance
Expand Down
34 changes: 34 additions & 0 deletions e2e/__tests__/extraGlobals.test.ts
@@ -0,0 +1,34 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import {tmpdir} from 'os';
import * as path from 'path';
import {cleanup, createEmptyPackage, writeFiles} from '../Utils';
import {json as runJest} from '../runJest';

const DIR = path.resolve(tmpdir(), 'extra-globals');

beforeEach(() => {
cleanup(DIR);
createEmptyPackage(DIR, {jest: {extraGlobals: ['Math']}});
});

afterAll(() => cleanup(DIR));

test('works with injected globals', () => {
writeFiles(DIR, {
'test.js': `
test('Math works when injected', () => {
expect(Math.floor(1.5)).toBe(1);
});
`,
});

const {exitCode} = runJest(DIR);

expect(exitCode).toBe(0);
});
2 changes: 1 addition & 1 deletion packages/jest-runtime/src/index.ts
Expand Up @@ -1097,7 +1097,7 @@ class Runtime {

const lastArgs: [Jest | undefined, ...Array<any>] = [
this._config.injectGlobals ? jestObject : undefined, // jest object
this._config.extraGlobals.map<unknown>(globalVariable => {
...this._config.extraGlobals.map<unknown>(globalVariable => {
if (this._environment.global[globalVariable]) {
return this._environment.global[globalVariable];
}
Expand Down

0 comments on commit 4bbaee6

Please sign in to comment.