Skip to content

Commit b5ddd2b

Browse files
author
Yves Le Maout
committed
Update to JSDom 1.0.0
To fix this issue : petkaantonov/bluebird#291
1 parent a10b226 commit b5ddd2b

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var document = require("jsdom").jsdom("<html><head></head><body></body></html>"),
2-
window = document.createWindow(),
2+
window = document.parentWindow,
33
globals = {};
44

55
// stash globals

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"main": "d3.js"
5252
},
5353
"dependencies": {
54-
"jsdom": "0.5.7"
54+
"jsdom": "1.0.0"
5555
},
5656
"devDependencies": {
5757
"smash": "~0.0.12",

test/load.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = function() {
4646
console: console,
4747
XMLHttpRequest: XMLHttpRequest,
4848
document: document,
49-
window: document.createWindow(),
49+
window: document.parentWindow,
5050
setTimeout: setTimeout,
5151
clearTimeout: clearTimeout,
5252
Date: Date // so we can override Date.now in tests, and use deepEqual

test/selection/append-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ suite.addBatch({
1414
"appends an HTML element": function(body) {
1515
var div = body.append("div");
1616
assert.equal(div[0][0].tagName, "DIV");
17-
assert.isNull(div[0][0].namespaceURI);
17+
assert.equal(div[0][0].namespaceURI, "http://www.w3.org/1999/xhtml");
1818
assert.isTrue(div[0][0].parentNode === body.node());
1919
assert.isTrue(div[0][0] === body.node().lastChild);
2020
},
@@ -58,8 +58,8 @@ suite.addBatch({
5858
assert.equal(span[0].length, 2);
5959
assert.equal(span[0][0].tagName, "SPAN");
6060
assert.equal(span[0][1].tagName, "SPAN");
61-
assert.isNull(span[0][0].namespaceURI);
62-
assert.isNull(span[0][1].namespaceURI);
61+
assert.equal(span[0][0].namespaceURI, "http://www.w3.org/1999/xhtml");
62+
assert.equal(span[0][1].namespaceURI, "http://www.w3.org/1999/xhtml");
6363
assert.isTrue(span[0][0].parentNode === div[0][0]);
6464
assert.isTrue(span[0][1].parentNode === div[0][1]);
6565
assert.isTrue(div[0][0].lastChild === span[0][0]);

test/selection/insert-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ suite.addBatch({
1515
var span = body.html("").append("span");
1616
var div = body.insert("div", "span");
1717
assert.equal(div[0][0].tagName, "DIV");
18-
assert.isNull(div[0][0].namespaceURI);
18+
assert.equal(div[0][0].namespaceURI, "http://www.w3.org/1999/xhtml");
1919
assert.domEqual(div[0][0], body.node().firstChild);
2020
assert.domEqual(div[0][0].nextSibling, span[0][0]);
2121
},
2222
"inserts before the specified node": function(body) {
2323
var span = body.html("").append("span");
2424
var div = body.insert("div", function() { return span.node(); });
2525
assert.equal(div[0][0].tagName, "DIV");
26-
assert.isNull(div[0][0].namespaceURI);
26+
assert.equal(div[0][0].namespaceURI, "http://www.w3.org/1999/xhtml");
2727
assert.domEqual(div[0][0], body.node().firstChild);
2828
assert.domEqual(div[0][0].nextSibling, span[0][0]);
2929
},
3030
"appends an HTML element": function(body) {
3131
var div = body.insert("div");
3232
assert.equal(div[0][0].tagName, "DIV");
33-
assert.isNull(div[0][0].namespaceURI);
33+
assert.equal(div[0][0].namespaceURI, "http://www.w3.org/1999/xhtml");
3434
assert.domEqual(div[0][0], body.node().lastChild);
3535
},
3636
"appends an SVG element": function(body) {
@@ -67,8 +67,8 @@ suite.addBatch({
6767
assert.equal(span[0].length, 2);
6868
assert.equal(span[0][0].tagName, "SPAN");
6969
assert.equal(span[0][1].tagName, "SPAN");
70-
assert.isNull(span[0][0].namespaceURI);
71-
assert.isNull(span[0][1].namespaceURI);
70+
assert.equal(span[0][0].namespaceURI, "http://www.w3.org/1999/xhtml");
71+
assert.equal(span[0][1].namespaceURI, "http://www.w3.org/1999/xhtml");
7272
assert.domEqual(span[0][0].parentNode, div[0][0]);
7373
assert.domEqual(span[0][1].parentNode, div[0][1]);
7474
assert.domEqual(div[0][0].lastChild, span[0][0]);

0 commit comments

Comments
 (0)