Skip to content

Commit 409dbae

Browse files
committed
Updated jsdom and made tests pass
1 parent c4db28c commit 409dbae

File tree

3 files changed

+11
-44
lines changed

3 files changed

+11
-44
lines changed

demo/bundle.js

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19581,70 +19581,37 @@ module.exports = require('./lib/React');
1958119581
var process = module.exports = {};
1958219582
var queue = [];
1958319583
var draining = false;
19584-
var currentQueue;
19585-
var queueIndex = -1;
19586-
19587-
function cleanUpNextTick() {
19588-
draining = false;
19589-
if (currentQueue.length) {
19590-
queue = currentQueue.concat(queue);
19591-
} else {
19592-
queueIndex = -1;
19593-
}
19594-
if (queue.length) {
19595-
drainQueue();
19596-
}
19597-
}
1959819584

1959919585
function drainQueue() {
1960019586
if (draining) {
1960119587
return;
1960219588
}
19603-
var timeout = setTimeout(cleanUpNextTick);
1960419589
draining = true;
19605-
19590+
var currentQueue;
1960619591
var len = queue.length;
1960719592
while(len) {
1960819593
currentQueue = queue;
1960919594
queue = [];
19610-
while (++queueIndex < len) {
19611-
currentQueue[queueIndex].run();
19595+
var i = -1;
19596+
while (++i < len) {
19597+
currentQueue[i]();
1961219598
}
19613-
queueIndex = -1;
1961419599
len = queue.length;
1961519600
}
19616-
currentQueue = null;
1961719601
draining = false;
19618-
clearTimeout(timeout);
1961919602
}
19620-
1962119603
process.nextTick = function (fun) {
19622-
var args = new Array(arguments.length - 1);
19623-
if (arguments.length > 1) {
19624-
for (var i = 1; i < arguments.length; i++) {
19625-
args[i - 1] = arguments[i];
19626-
}
19627-
}
19628-
queue.push(new Item(fun, args));
19629-
if (queue.length === 1 && !draining) {
19604+
queue.push(fun);
19605+
if (!draining) {
1963019606
setTimeout(drainQueue, 0);
1963119607
}
1963219608
};
1963319609

19634-
// v8 likes predictible objects
19635-
function Item(fun, array) {
19636-
this.fun = fun;
19637-
this.array = array;
19638-
}
19639-
Item.prototype.run = function () {
19640-
this.fun.apply(null, this.array);
19641-
};
1964219610
process.title = 'browser';
1964319611
process.browser = true;
1964419612
process.env = {};
1964519613
process.argv = [];
1964619614
process.version = ''; // empty string to avoid regexp issues
19647-
process.versions = {};
1964819615

1964919616
function noop() {}
1965019617

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
"mocha": "^1.18.2",
5656
"mocha-stylus-compiler": "^1.0.0",
5757
"nanodom": "0.0.3",
58+
"react-addons-test-utils": "^0.14.1",
5859
"stylusify": "^1.0.0",
59-
"testdom": "^1.0.1"
60+
"testdom": "^2.0.0"
6061
}
6162
}

test/spec.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ var dom = require('testdom')('<html><body></body></html>')
22
var assert = require('assert')
33
var _ = require('lodash')
44
var React = require('react')
5+
var ReactDOM = require('react-dom')
56
var nanodom = require('nanodom')
6-
var ReactAddons = require('react/addons')
77
var ReactDatalist = require('../src/ReactDataList')
8-
9-
var ReactTestUtils = React.addons.TestUtils
8+
var ReactTestUtils = require('react-addons-test-utils')
109

1110
/** VARIABLES **/
1211

@@ -20,7 +19,7 @@ var blurTimeout = 250
2019

2120
function render(props, callback) {
2221
let _props = Object.assign(props, defaultProps)
23-
return React.render(<ReactDatalist {..._props} />, document.body, function() {
22+
return ReactDOM.render(<ReactDatalist {..._props} />, document.body, function() {
2423
if (typeof callback === 'function') setTimeout(callback)
2524
})
2625
}

0 commit comments

Comments
 (0)