Fix tests mixing environments

facebook · Nov 23, 2021 · 22a2308 · 22a2308
1 parent cd0dd46
commit 22a2308
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
+ * @jest-environment node
  */
 
 'use strict';
@@ -21,8 +22,6 @@ let useSyncExternalStore;
 let useSyncExternalStoreWithSelector;
 let PropTypes;
 let textCache;
-let window;
-let document;
 let writable;
 let CSPnonce = null;
 let container;
@@ -36,7 +35,6 @@ describe('ReactDOMFizzServer', () => {
  JSDOM = require('jsdom').JSDOM;
  Scheduler = require('scheduler');
  React = require('react');
- ReactDOM = require('react-dom');
  if (__EXPERIMENTAL__) {
  ReactDOMFizzServer = require('react-dom/server');
  }
@@ -71,8 +69,11 @@ describe('ReactDOMFizzServer', () => {
  runScripts: 'dangerously',
  },
  );
- window = jsdom.window;
- document = jsdom.window.document;
+ global.window = jsdom.window;
+ global.document = jsdom.window.document;
+ global.navigator = jsdom.window.navigator;
+ ReactDOM = require('react-dom');
+
  container = document.getElementById('container');
 
  buffer = '';

diff --git a/packages/react-dom/src/__tests__/ReactDOMUseId-test.js b/packages/react-dom/src/__tests__/ReactDOMUseId-test.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
+ * @jest-environment node
  */
 
 let JSDOM;
@@ -17,7 +18,6 @@ let Stream;
 let Suspense;
 let useId;
 let useState;
-let document;
 let writable;
 let container;
 let buffer = '';
@@ -29,7 +29,6 @@ describe('useId', () => {
  jest.resetModules();
  JSDOM = require('jsdom').JSDOM;
  React = require('react');
- ReactDOM = require('react-dom');
  Scheduler = require('scheduler');
  clientAct = require('jest-react').act;
  ReactDOMFizzServer = require('react-dom/server');
@@ -45,7 +44,11 @@ describe('useId', () => {
  runScripts: 'dangerously',
  },
  );
- document = jsdom.window.document;
+ global.window = jsdom.window;
+ global.document = jsdom.window.document;
+ global.navigator = jsdom.window.navigator;
+ ReactDOM = require('react-dom');
+
  container = document.getElementById('container');
 
  buffer = '';