Update to Jest 22

package.json

@@ -11,7 +11,7 @@
     "babel-code-frame": "^6.26.0",
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.1.0",
-    "babel-jest": "^21.3.0-beta.4",
+    "babel-jest": "^22.0.4",
     "babel-plugin-check-es2015-constants": "^6.5.0",
     "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
@@ -67,10 +67,7 @@
     "gzip-js": "~0.3.2",
     "gzip-size": "^3.0.0",
     "jasmine-check": "^1.0.0-rc.0",
-    "jest": "^21.3.0-beta.4",
-    "jest-config": "^21.3.0-beta.4",
-    "jest-jasmine2": "^21.3.0-beta.4",
-    "jest-runtime": "^21.3.0-beta.4",
+    "jest": "^22.0.4",
     "merge-stream": "^1.0.0",
     "minimatch": "^3.0.4",
     "minimist": "^1.2.0",

packages/react-art/src/__tests__/ReactART-test.js

@@ -54,7 +54,12 @@ function testDOMNodeStructure(domNode, expectedStructure) {
 }
 
 describe('ReactART', () => {
+  let container;
+
   beforeEach(() => {
+    container = document.createElement('div');
+    document.body.appendChild(container);
+
     ARTCurrentMode.setCurrent(ARTSVGMode);
 
     Group = ReactART.Group;
@@ -104,6 +109,11 @@ describe('ReactART', () => {
     };
   });
 
+  afterEach(() => {
+    document.body.removeChild(container);
+    container = null;
+  });
+
   it('should have the correct lifecycle state', () => {
     let instance = <TestComponent />;
     instance = ReactTestUtils.renderIntoDocument(instance);
@@ -142,7 +152,6 @@ describe('ReactART', () => {
   });
 
   it('should be able to reorder components', () => {
-    const container = document.createElement('div');
     const instance = ReactDOM.render(
       <TestComponent flipped={false} />,
       container,
@@ -189,8 +198,6 @@ describe('ReactART', () => {
   });
 
   it('should be able to reorder many components', () => {
-    const container = document.createElement('div');
-
     class Component extends React.Component {
       render() {
         const chars = this.props.chars.split('');
@@ -296,17 +303,13 @@ describe('ReactART', () => {
         );
       }
     }
-
-    const container = document.createElement('div');
     ReactDOM.render(<Outer />, container);
     expect(ref).not.toBeDefined();
     ReactDOM.render(<Outer mountCustomShape={true} />, container);
     expect(ref.constructor).toBe(CustomShape);
   });
 
   it('adds and updates event handlers', () => {
-    const container = document.createElement('div');
-
     function render(onClick) {
       return ReactDOM.render(
         <Surface>
@@ -319,8 +322,11 @@ describe('ReactART', () => {
     function doClick(instance) {
       const path = ReactDOM.findDOMNode(instance).querySelector('path');
 
-      // ReactTestUtils.Simulate.click doesn't work with SVG elements
-      path.click();
+      path.dispatchEvent(
+        new MouseEvent('click', {
+          bubbles: true,
+        }),
+      );
     }
 
     const onClick1 = jest.fn();

packages/react-art/src/__tests__/__snapshots__/ReactART-test.js.snap

@@ -3,7 +3,7 @@
 exports[`ReactARTComponents should generate a <Shape> with props for drawing the Circle 1`] = `
 <Shape
   d={
-     {
+    Object {
       "_pivotX": 0,
       "_pivotY": -10,
       "path": Array [
@@ -28,7 +28,7 @@ exports[`ReactARTComponents should generate a <Shape> with props for drawing the
 exports[`ReactARTComponents should generate a <Shape> with props for drawing the Rectangle 1`] = `
 <Shape
   d={
-     {
+    Object {
       "_pivotX": 0,
       "_pivotY": 0,
       "path": Array [
@@ -54,7 +54,7 @@ exports[`ReactARTComponents should generate a <Shape> with props for drawing the
 exports[`ReactARTComponents should generate a <Shape> with props for drawing the Wedge 1`] = `
 <Shape
   d={
-     {
+    Object {
       "_pivotX": 0,
       "_pivotY": 50,
       "path": Array [

packages/react-dom/src/__tests__/DOMPropertyOperations-test.js

@@ -34,7 +34,10 @@ describe('DOMPropertyOperations', () => {
     });
 
     it('should set values as namespace attributes if necessary', () => {
-      const container = document.createElement('svg');
+      const container = document.createElementNS(
+        'http://www.w3.org/2000/svg',
+        'svg',
+      );
       ReactDOM.render(<image xlinkHref="about:blank" />, container);
       expect(
         container.firstChild.getAttributeNS(

packages/react-dom/src/__tests__/ReactDOMServerIntegrationAttributes-test.js

@@ -488,21 +488,36 @@ describe('ReactDOMServerIntegration', () => {
       );
 
       itRenders('badly cased SVG attribute with a warning', async render => {
-        const e = await render(<text textlength="10" />, 1);
-        expect(e.getAttribute('textLength')).toBe('10');
+        const e = await render(
+          <svg>
+            <text textlength="10" />
+          </svg>,
+          1,
+        );
+        expect(e.firstChild.getAttribute('textLength')).toBe('10');
       });
 
       itRenders('no badly cased aliased SVG attribute alias', async render => {
-        const e = await render(<text strokedasharray="10 10" />, 1);
-        expect(e.hasAttribute('stroke-dasharray')).toBe(false);
-        expect(e.getAttribute('strokedasharray')).toBe('10 10');
+        const e = await render(
+          <svg>
+            <text strokedasharray="10 10" />
+          </svg>,
+          1,
+        );
+        expect(e.firstChild.hasAttribute('stroke-dasharray')).toBe(false);
+        expect(e.firstChild.getAttribute('strokedasharray')).toBe('10 10');
       });
 
       itRenders(
         'no badly cased original SVG attribute that is aliased',
         async render => {
-          const e = await render(<text stroke-dasharray="10 10" />, 1);
-          expect(e.getAttribute('stroke-dasharray')).toBe('10 10');
+          const e = await render(
+            <svg>
+              <text stroke-dasharray="10 10" />
+            </svg>,
+            1,
+          );
+          expect(e.firstChild.getAttribute('stroke-dasharray')).toBe('10 10');
         },
       );
     });

scripts/jest/setupEnvironment.js

@@ -31,6 +31,20 @@ global.cancelIdleCallback = function(callbackID) {
 // for the few that specifically test the logging by shadowing this
 // property. In real apps, it would usually not be defined at all.
 Error.prototype.suppressReactErrorLogging = true;
-if (typeof DOMException === 'function') {
+
+if (typeof window !== 'undefined') {
+  // Same as above.
   DOMException.prototype.suppressReactErrorLogging = true;
+
+  // Also prevent JSDOM from logging intentionally thrown errors.
+  // TODO: it might make sense to do it the other way around.
+  // https://github.com/facebook/react/issues/11098#issuecomment-355032539
+  window.addEventListener('error', event => {
+    if (event.error != null && event.error.suppressReactErrorLogging) {
+      event.preventDefault();
+    }
+  });
+
+  // Mock for ReactART.
+  HTMLCanvasElement.prototype.getContext = () => ({});
 }