X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=auto_tests%2Ftests%2FUtil.js;h=7c1eaa6aa6a2b22aee351fa7d2e5371a767a90a8;hb=2ef8997fe939afdfd7c2c09c393a3073897633bd;hp=305ed477e9ba02cd1636f13d53c78cb971523ceb;hpb=8021c59f150292bf1a12534e5092451140e49c77;p=dygraphs.git diff --git a/auto_tests/tests/Util.js b/auto_tests/tests/Util.js index 305ed47..7c1eaa6 100644 --- a/auto_tests/tests/Util.js +++ b/auto_tests/tests/Util.js @@ -62,10 +62,11 @@ Util.getLegend = function(parent) { * Assert that all elements have a certain style property. */ Util.assertStyleOfChildren = function(selector, property, expectedValue) { - assertTrue(selector.length > 0); - $.each(selector, function(idx, child) { - assertEquals(expectedValue, $(child).css(property)); - }); + assert.isTrue(selector.length > 0); + for (var idx = 0; idx < selector.length; idx++) { + var child = selector[idx]; + assert.equal(expectedValue, window.getComputedStyle(child)[property]); + } }; @@ -121,7 +122,7 @@ Util.overrideXMLHttpRequest = function(data) { this.responseText = data; }; FakeXMLHttpRequest.restore = function() { - XMLHttpRequest = originalXMLHttpRequest; + window.XMLHttpRequest = originalXMLHttpRequest; }; FakeXMLHttpRequest.respond = function() { for (var i = 0; i < requests.length; i++) { @@ -129,7 +130,7 @@ Util.overrideXMLHttpRequest = function(data) { } FakeXMLHttpRequest.restore(); }; - XMLHttpRequest = FakeXMLHttpRequest; + window.XMLHttpRequest = FakeXMLHttpRequest; return FakeXMLHttpRequest; };