Revert ReactDOMComponent-test

No need for the extra changes
facebook · Apr 6, 2017 · e61ddae · e61ddae
1 parent 9d99892
commit e61ddae
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 59 deletions.
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -756,28 +756,26 @@ describe('ReactDOMComponent', () => {
       };
     });
 
-    // We do not attach DOM listeners when not using create element
     it('should work error event on <source> element', () => {
+      spyOn(console, 'error');
       var container = document.createElement('div');
-      var onError = jest.fn();
-
       ReactDOM.render(
         <video>
           <source
             src="http://example.org/video"
             type="video/mp4"
-            onError={() => onError('onError called')}
+            onError={e => console.error('onError called')}
           />
         </video>,
         container,
       );
 
       var errorEvent = document.createEvent('Event');
       errorEvent.initEvent('error', false, false);
-      container.querySelector('source').dispatchEvent(errorEvent);
+      container.getElementsByTagName('source')[0].dispatchEvent(errorEvent);
 
-      expect(onError).toHaveBeenCalledTimes(1);
-      expect(onError).toHaveBeenCalledWith('onError called');
+      expectDev(console.error.calls.count()).toBe(1);
+      expectDev(console.error.calls.argsFor(0)[0]).toContain('onError called');
     });
 
     it('should not duplicate uppercased selfclosing tags', () => {
@@ -1057,33 +1055,31 @@ describe('ReactDOMComponent', () => {
     });
 
     it('should work load and error events on <image> element in SVG', () => {
-      var onError = jest.fn();
-      var onLoad = jest.fn();
-
+      spyOn(console, 'log');
       var container = document.createElement('div');
       ReactDOM.render(
         <svg>
           <image
             xlinkHref="http://example.org/image"
-            onError={() => onError('onError called')}
-            onLoad={() => onLoad('onLoad called')}
+            onError={e => console.log('onError called')}
+            onLoad={e => console.log('onLoad called')}
           />
         </svg>,
         container,
       );
 
-      var loadEvent = new Event('load');
-      var errorEvent = new Event('error');
-      var image = container.querySelector('image');
+      var loadEvent = document.createEvent('Event');
+      var errorEvent = document.createEvent('Event');
 
-      image.dispatchEvent(errorEvent);
-      image.dispatchEvent(loadEvent);
+      loadEvent.initEvent('load', false, false);
+      errorEvent.initEvent('error', false, false);
 
-      expect(onError).toHaveBeenCalledTimes(1);
-      expect(onError).toHaveBeenCalledWith('onError called');
+      container.getElementsByTagName('image')[0].dispatchEvent(errorEvent);
+      container.getElementsByTagName('image')[0].dispatchEvent(loadEvent);
 
-      expect(onLoad).toHaveBeenCalledTimes(1);
-      expect(onLoad).toHaveBeenCalledWith('onLoad called');
+      expectDev(console.log.calls.count()).toBe(2);
+      expectDev(console.log.calls.argsFor(0)[0]).toContain('onError called');
+      expectDev(console.log.calls.argsFor(1)[0]).toContain('onLoad called');
     });
   });
 

diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js
@@ -16,7 +16,6 @@ var ReactDOM;
 var ReactDOMComponentTree;
 var ReactTestUtils;
 var SelectEventPlugin;
-var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
 
 describe('SelectEventPlugin', () => {
   function extract(node, topLevelEvent) {
@@ -60,37 +59,34 @@ describe('SelectEventPlugin', () => {
     expect(mouseup).toBe(null);
   });
 
-  if (ReactDOMFeatureFlags.useCreateElement) {
-    // We do not attach DOM listeners when not using create element
-    it('should extract if an `onSelect` listener is present', () => {
-      class WithSelect extends React.Component {
-        render() {
-          return <input type="text" onSelect={this.props.onSelect} />;
-        }
+  it('should extract if an `onSelect` listener is present', () => {
+    class WithSelect extends React.Component {
+      render() {
+        return <input type="text" onSelect={this.props.onSelect} />;
       }
+    }
 
-      var cb = jest.fn();
+    var cb = jest.fn();
 
-      var rendered = ReactTestUtils.renderIntoDocument(
-        <WithSelect onSelect={cb} />,
-      );
-      var node = ReactDOM.findDOMNode(rendered);
+    var rendered = ReactTestUtils.renderIntoDocument(
+      <WithSelect onSelect={cb} />,
+    );
+    var node = ReactDOM.findDOMNode(rendered);
 
-      node.selectionStart = 0;
-      node.selectionEnd = 0;
-      node.focus();
+    node.selectionStart = 0;
+    node.selectionEnd = 0;
+    node.focus();
 
-      var focus = extract(node, 'topFocus');
-      expect(focus).toBe(null);
+    var focus = extract(node, 'topFocus');
+    expect(focus).toBe(null);
 
-      var mousedown = extract(node, 'topMouseDown');
-      expect(mousedown).toBe(null);
+    var mousedown = extract(node, 'topMouseDown');
+    expect(mousedown).toBe(null);
 
-      var mouseup = extract(node, 'topMouseUp');
-      expect(mouseup).not.toBe(null);
-      expect(typeof mouseup).toBe('object');
-      expect(mouseup.type).toBe('select');
-      expect(mouseup.target).toBe(node);
-    });
-  }
+    var mouseup = extract(node, 'topMouseUp');
+    expect(mouseup).not.toBe(null);
+    expect(typeof mouseup).toBe('object');
+    expect(mouseup.type).toBe('select');
+    expect(mouseup.target).toBe(node);
+  });
 });
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMIframe-test.js
@@ -15,27 +15,23 @@ describe('ReactDOMIframe', () => {
   var React;
   var ReactDOM;
   var ReactTestUtils;
-  var ReactDOMFeatureFlags;
 
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
-    ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
   });
 
   it('should trigger load events', () => {
-    if (ReactDOMFeatureFlags.createElement) {
-      var onLoadSpy = jasmine.createSpy();
-      var iframe = React.createElement('iframe', {onLoad: onLoadSpy});
-      iframe = ReactTestUtils.renderIntoDocument(iframe);
+    var onLoadSpy = jasmine.createSpy();
+    var iframe = React.createElement('iframe', {onLoad: onLoadSpy});
+    iframe = ReactTestUtils.renderIntoDocument(iframe);
 
-      var loadEvent = document.createEvent('Event');
-      loadEvent.initEvent('load', false, false);
+    var loadEvent = document.createEvent('Event');
+    loadEvent.initEvent('load', false, false);
 
-      ReactDOM.findDOMNode(iframe).dispatchEvent(loadEvent);
+    ReactDOM.findDOMNode(iframe).dispatchEvent(loadEvent);
 
-      expect(onLoadSpy).toHaveBeenCalled();
-    }
+    expect(onLoadSpy).toHaveBeenCalled();
   });
 });