Skip to content

Commit d26fc06

Browse files
committed
Revert ReactDOMComponent-test
No need for the extra changes
1 parent 9d99892 commit d26fc06

File tree

2 files changed

+40
-48
lines changed

2 files changed

+40
-48
lines changed

src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -756,28 +756,26 @@ describe('ReactDOMComponent', () => {
756756
};
757757
});
758758

759-
// We do not attach DOM listeners when not using create element
760759
it('should work error event on <source> element', () => {
760+
spyOn(console, 'error');
761761
var container = document.createElement('div');
762-
var onError = jest.fn();
763-
764762
ReactDOM.render(
765763
<video>
766764
<source
767765
src="http://example.org/video"
768766
type="video/mp4"
769-
onError={() => onError('onError called')}
767+
onError={e => console.error('onError called')}
770768
/>
771769
</video>,
772770
container,
773771
);
774772

775773
var errorEvent = document.createEvent('Event');
776774
errorEvent.initEvent('error', false, false);
777-
container.querySelector('source').dispatchEvent(errorEvent);
775+
container.getElementsByTagName('source')[0].dispatchEvent(errorEvent);
778776

779-
expect(onError).toHaveBeenCalledTimes(1);
780-
expect(onError).toHaveBeenCalledWith('onError called');
777+
expectDev(console.error.calls.count()).toBe(1);
778+
expectDev(console.error.calls.argsFor(0)[0]).toContain('onError called');
781779
});
782780

783781
it('should not duplicate uppercased selfclosing tags', () => {
@@ -1057,33 +1055,31 @@ describe('ReactDOMComponent', () => {
10571055
});
10581056

10591057
it('should work load and error events on <image> element in SVG', () => {
1060-
var onError = jest.fn();
1061-
var onLoad = jest.fn();
1062-
1058+
spyOn(console, 'log');
10631059
var container = document.createElement('div');
10641060
ReactDOM.render(
10651061
<svg>
10661062
<image
10671063
xlinkHref="http://example.org/image"
1068-
onError={() => onError('onError called')}
1069-
onLoad={() => onLoad('onLoad called')}
1064+
onError={e => console.log('onError called')}
1065+
onLoad={e => console.log('onLoad called')}
10701066
/>
10711067
</svg>,
10721068
container,
10731069
);
10741070

1075-
var loadEvent = new Event('load');
1076-
var errorEvent = new Event('error');
1077-
var image = container.querySelector('image');
1071+
var loadEvent = document.createEvent('Event');
1072+
var errorEvent = document.createEvent('Event');
10781073

1079-
image.dispatchEvent(errorEvent);
1080-
image.dispatchEvent(loadEvent);
1074+
loadEvent.initEvent('load', false, false);
1075+
errorEvent.initEvent('error', false, false);
10811076

1082-
expect(onError).toHaveBeenCalledTimes(1);
1083-
expect(onError).toHaveBeenCalledWith('onError called');
1077+
container.getElementsByTagName('image')[0].dispatchEvent(errorEvent);
1078+
container.getElementsByTagName('image')[0].dispatchEvent(loadEvent);
10841079

1085-
expect(onLoad).toHaveBeenCalledTimes(1);
1086-
expect(onLoad).toHaveBeenCalledWith('onLoad called');
1080+
expectDev(console.log.calls.count()).toBe(2);
1081+
expectDev(console.log.calls.argsFor(0)[0]).toContain('onError called');
1082+
expectDev(console.log.calls.argsFor(1)[0]).toContain('onLoad called');
10871083
});
10881084
});
10891085

src/renderers/dom/shared/eventPlugins/__tests__/SelectEventPlugin-test.js

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ var ReactDOM;
1616
var ReactDOMComponentTree;
1717
var ReactTestUtils;
1818
var SelectEventPlugin;
19-
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
2019

2120
describe('SelectEventPlugin', () => {
2221
function extract(node, topLevelEvent) {
@@ -60,37 +59,34 @@ describe('SelectEventPlugin', () => {
6059
expect(mouseup).toBe(null);
6160
});
6261

63-
if (ReactDOMFeatureFlags.useCreateElement) {
64-
// We do not attach DOM listeners when not using create element
65-
it('should extract if an `onSelect` listener is present', () => {
66-
class WithSelect extends React.Component {
67-
render() {
68-
return <input type="text" onSelect={this.props.onSelect} />;
69-
}
62+
it('should extract if an `onSelect` listener is present', () => {
63+
class WithSelect extends React.Component {
64+
render() {
65+
return <input type="text" onSelect={this.props.onSelect} />;
7066
}
67+
}
7168

72-
var cb = jest.fn();
69+
var cb = jest.fn();
7370

74-
var rendered = ReactTestUtils.renderIntoDocument(
75-
<WithSelect onSelect={cb} />,
76-
);
77-
var node = ReactDOM.findDOMNode(rendered);
71+
var rendered = ReactTestUtils.renderIntoDocument(
72+
<WithSelect onSelect={cb} />,
73+
);
74+
var node = ReactDOM.findDOMNode(rendered);
7875

79-
node.selectionStart = 0;
80-
node.selectionEnd = 0;
81-
node.focus();
76+
node.selectionStart = 0;
77+
node.selectionEnd = 0;
78+
node.focus();
8279

83-
var focus = extract(node, 'topFocus');
84-
expect(focus).toBe(null);
80+
var focus = extract(node, 'topFocus');
81+
expect(focus).toBe(null);
8582

86-
var mousedown = extract(node, 'topMouseDown');
87-
expect(mousedown).toBe(null);
83+
var mousedown = extract(node, 'topMouseDown');
84+
expect(mousedown).toBe(null);
8885

89-
var mouseup = extract(node, 'topMouseUp');
90-
expect(mouseup).not.toBe(null);
91-
expect(typeof mouseup).toBe('object');
92-
expect(mouseup.type).toBe('select');
93-
expect(mouseup.target).toBe(node);
94-
});
95-
}
86+
var mouseup = extract(node, 'topMouseUp');
87+
expect(mouseup).not.toBe(null);
88+
expect(typeof mouseup).toBe('object');
89+
expect(mouseup.type).toBe('select');
90+
expect(mouseup.target).toBe(node);
91+
});
9692
});

0 commit comments

Comments
 (0)