Remove mixed environments

They were required when this branch was based on an earlier commit. But now we don't need a mixed environment anymore. Unclear why though.
facebook · Mar 19, 2022 · 1503363 · 1503363
1 parent 82d6f13
commit 1503363
Show file tree

Hide file tree

Showing 21 changed files with 45 additions and 321 deletions.
diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
@@ -5,12 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 'use strict';
 
-let JSDOM;
 let Stream;
 let Scheduler;
 let React;
@@ -24,27 +22,14 @@ let PropTypes;
 let textCache;
 let writable;
 let CSPnonce = null;
-let container;
+let container = null;
 let buffer = '';
 let hasErrored = false;
 let fatalError = undefined;
 
 describe('ReactDOMFizzServer', () => {
   beforeEach(() => {
     jest.resetModules();
-    // Creating mixed environment for `react-dom` + `react-dom/server`
-    JSDOM = require('jsdom').JSDOM;
-    const jsdom = new JSDOM(
-      '<!DOCTYPE html><html><head></head><body><div id="container">',
-      {
-        runScripts: 'dangerously',
-      },
-    );
-    global.window = jsdom.window;
-    global.document = jsdom.window.document;
-    global.navigator = jsdom.window.navigator;
-    global.Node = jsdom.window.Node;
-
     Scheduler = require('scheduler');
     React = require('react');
     ReactDOMClient = require('react-dom/client');
@@ -75,7 +60,8 @@ describe('ReactDOMFizzServer', () => {
 
     textCache = new Map();
 
-    container = document.getElementById('container');
+    container = document.createElement('div');
+    document.body.appendChild(container);
 
     buffer = '';
     hasErrored = false;
@@ -91,6 +77,11 @@ describe('ReactDOMFizzServer', () => {
     });
   });
 
+  afterEach(() => {
+    container?.remove();
+    container = null
+  });
+
   async function act(callback) {
     await callback();
     // Await one turn around the event loop.

diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js
@@ -5,18 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
-let JSDOM;
 let React;
 let ReactDOMClient;
 let Scheduler;
 let clientAct;
 let ReactDOMFizzServer;
 let Stream;
 let writable;
-let container;
+let container = null;
 let buffer = '';
 let hasErrored = false;
 let fatalError = undefined;
@@ -25,19 +23,6 @@ let textCache;
 describe('ReactDOMFizzShellHydration', () => {
   beforeEach(() => {
     jest.resetModules();
-    // Creating mixed environment for `react-dom` + `react-dom/server`
-    JSDOM = require('jsdom').JSDOM;
-    const jsdom = new JSDOM(
-      '<!DOCTYPE html><html><head></head><body><div id="container">',
-      {
-        runScripts: 'dangerously',
-      },
-    );
-    global.window = jsdom.window;
-    global.document = jsdom.window.document;
-    global.navigator = jsdom.window.navigator;
-    global.Node = jsdom.window.Node;
-
     React = require('react');
     ReactDOMClient = require('react-dom/client');
     Scheduler = require('scheduler');
@@ -47,7 +32,8 @@ describe('ReactDOMFizzShellHydration', () => {
 
     textCache = new Map();
 
-    container = document.getElementById('container');
+    container = document.createElement('div');
+    document.body.appendChild(container);
 
     buffer = '';
     hasErrored = false;
@@ -63,6 +49,11 @@ describe('ReactDOMFizzShellHydration', () => {
     });
   });
 
+  afterEach(() => {
+    container?.remove();
+    container = null;
+  });
+
   async function serverAct(callback) {
     await callback();
     // Await one turn around the event loop.

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js
@@ -5,15 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 'use strict';
 
 const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
 const ReactFeatureFlags = require('shared/ReactFeatureFlags');
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactTestUtils;
@@ -22,19 +20,6 @@ let ReactDOMServer;
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationBasic-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationBasic-test.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 'use strict';
@@ -14,7 +13,6 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
 
 const TEXT_NODE_TYPE = 3;
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactDOMServer;
@@ -23,19 +21,6 @@ let ReactTestUtils;
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationCheckbox-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationCheckbox-test.js
@@ -14,7 +14,6 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
 // Set by `yarn test-fire`.
 const {disableInputAttributeSyncing} = require('shared/ReactFeatureFlags');
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactDOMServer;
@@ -23,19 +22,6 @@ let ReactTestUtils;
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationClassContextType-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationClassContextType-test.js
@@ -5,14 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 'use strict';
 
 const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactDOMServer;
@@ -21,19 +19,6 @@ let ReactTestUtils;
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationElements-test.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 'use strict';
@@ -14,27 +13,13 @@ const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegratio
 
 const TEXT_NODE_TYPE = 3;
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactDOMServer;
 let ReactTestUtils;
 
 function initModules() {
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');
@@ -58,7 +43,7 @@ const {
   clientRenderOnServerString,
 } = ReactDOMServerIntegrationUtils(initModules);
 
-describe('ReactDOMServerIntegration', () => {
+describe('ReactDOMServerIntegrationElements', () => {
   beforeEach(() => {
     resetModules();
   });

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationFragment-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationFragment-test.js
@@ -5,14 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 'use strict';
 
 const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactDOMServer;
@@ -21,19 +19,6 @@ let ReactTestUtils;
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');

diff --git a/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js b/packages/react-dom/src/__tests__/ReactDOMServerIntegrationHooks-test.js
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @emails react-core
- * @jest-environment node
  */
 
 /* eslint-disable no-func-assign */
@@ -14,7 +13,6 @@
 
 const ReactDOMServerIntegrationUtils = require('./utils/ReactDOMServerIntegrationTestUtils');
 
-let JSDOM;
 let React;
 let ReactDOM;
 let ReactDOMServer;
@@ -38,19 +36,6 @@ let clearYields;
 function initModules() {
   // Reset warning cache.
   jest.resetModules();
-  // Creating mixed environment for `react-dom` + `react-dom/server`
-  JSDOM = require('jsdom').JSDOM;
-  const jsdom = new JSDOM(
-    '<!DOCTYPE html><html><head></head><body><div id="container">',
-    {
-      runScripts: 'dangerously',
-    },
-  );
-  global.window = jsdom.window;
-  global.document = jsdom.window.document;
-  global.navigator = jsdom.window.navigator;
-  global.Node = jsdom.window.Node;
-
   React = require('react');
   ReactDOM = require('react-dom');
   ReactDOMServer = require('react-dom/server');
@@ -93,7 +78,7 @@ const {
   serverRender,
 } = ReactDOMServerIntegrationUtils(initModules);
 
-describe('ReactDOMServerHooks', () => {
+describe('ReactDOMServerIntegrationHooks', () => {
   beforeEach(() => {
     resetModules();
   });