Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support userAgent option for jsdom environment #11773

Merged
merged 6 commits into from Aug 23, 2021
Merged

fix: support userAgent option for jsdom environment #11773

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a48a5f
feat: support userAgent option for jsdom environment
nwalters512 Aug 20, 2021
ac0610f
Add test case
nwalters512 Aug 20, 2021
953ca86
Add CHANGELOG entry
nwalters512 Aug 21, 2021
f8ff4c8
Update CHANGELOG.md
SimenB Aug 23, 2021
a94df62
fix lint errors and remove cast
SimenB Aug 23, 2021
4b15c27
moar lint
SimenB Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@

### Fixes

- `[jest-environment-jsdom]` Add support for `userAgent` option ([#11773](https://github.com/facebook/jest/pull/11773))
- `[jest-environment-node]` Add `Event` and `EventTarget` to node global environment. ([#11705](https://github.com/facebook/jest/issues/11705))
- `[jest-mock]` Fix `spyOn` to use `Object.prototype.hasOwnProperty` [#11721](https://github.com/facebook/jest/pull/11721)
- `[jest-resolver]` Add dependency on `jest-haste-map` [#11759](https://github.com/facebook/jest/pull/11759)
Expand Down
10 changes: 10 additions & 0 deletions packages/jest-environment-jsdom/src/__tests__/jsdom_environment.test.ts
View file
Open in desktop
Expand Up @@ -27,4 +27,14 @@ describe('JSDomEnvironment', () => {

expect(env.fakeTimersModern).toBeDefined();
});

it('should respect userAgent option', () => {
const env = new JSDomEnvironment(makeProjectConfig({
testEnvironmentOptions: {
userAgent: 'foo',
},
}));

expect(env.dom.window.navigator.userAgent).toEqual('foo');
});
});
8 changes: 7 additions & 1 deletion packages/jest-environment-jsdom/src/index.ts
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
*/

import type {Context} from 'vm';
import {JSDOM, VirtualConsole} from 'jsdom';
import {JSDOM, ResourceLoader, VirtualConsole} from 'jsdom';
import type {EnvironmentContext, JestEnvironment} from '@jest/environment';
import {LegacyFakeTimers, ModernFakeTimers} from '@jest/fake-timers';
import type {Config, Global} from '@jest/types';
Expand All @@ -33,6 +33,12 @@ class JSDOMEnvironment implements JestEnvironment {
constructor(config: Config.ProjectConfig, options?: EnvironmentContext) {
this.dom = new JSDOM('<!DOCTYPE html>', {
pretendToBeVisual: true,
resources:
typeof config.testEnvironmentOptions.userAgent === 'string'
? new ResourceLoader({
userAgent: config.testEnvironmentOptions.userAgent,
})
: undefined,
runScripts: 'dangerously',
url: config.testURL,
virtualConsole: new VirtualConsole().sendTo(options?.console || console),
Expand Down