vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tests for IE

Browse source
This commit is contained in:
Leo Horie 2014-10-06 21:46:18 -04:00
parent 07042b6fea
commit a4c98e63e8
5 changed files with 60 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mithril.js
View file

@ -22,15 +22,14 @@ Mithril = m = new function app(window, undefined) {
* *
*/ */
function m() { function m() {
var arrSlice = Array.prototype.slice; var args = [].slice.call(arguments)
var args = arrSlice.call(arguments, 0)
var hasAttrs = args[1] != null && isObj(args[1]) && !("tag" in args[1]) && !("subtree" in args[1]) var hasAttrs = args[1] != null && isObj(args[1]) && !("tag" in args[1]) && !("subtree" in args[1])
var attrs = hasAttrs ? args[1] : {} var attrs = hasAttrs ? args[1] : {}
var classAttrName = "class" in attrs ? "class" : "className" var classAttrName = "class" in attrs ? "class" : "className"
var cell = {tag: "div", attrs: {}} var cell = {tag: "div", attrs: {}}
var match, classes = [] var match, classes = []
while (match = parser.exec(args[0])) { while (match = parser.exec(args[0])) {
if (match[1] == "") cell.tag = match[2] if (match[1] == "" && match[2]) cell.tag = match[2]
else if (match[1] == "#") cell.attrs.id = match[2] else if (match[1] == "#") cell.attrs.id = match[2]
else if (match[1] == ".") classes.push(match[2]) else if (match[1] == ".") classes.push(match[2])
else if (match[3][0] == "[") { else if (match[3][0] == "[") {
@ -42,8 +41,8 @@ Mithril = m = new function app(window, undefined) {
var children = hasAttrs ? args[2] : args[1] var children = hasAttrs ? args[2] : args[1]
if (isArr(children) || type(children) == "[object Arguments]") { if (isArr(children)) {
cell.children = arrSlice.call(children, 0) cell.children = children
} }
else { else {
cell.children = hasAttrs ? args.slice(2) : args.slice(1) cell.children = hasAttrs ? args.slice(2) : args.slice(1)

2
tests/index.html
View file

@ -1,8 +1,8 @@
<!doctype html> <!doctype html>
<script src="http://polyfill.io"></script> <script src="http://polyfill.io"></script>
<script src="../mithril.js"></script>
<script src="test.js"></script> <script src="test.js"></script>
<script src="mock.js"></script> <script src="mock.js"></script>
<script src="../mithril.js"></script>
<script src="mithril-tests.js"></script> <script src="mithril-tests.js"></script>
<p>Open the console to see the test report</p> <p>Open the console to see the test report</p>

35
tests/mithril-tests.js
View file

@ -775,15 +775,6 @@ function testMithril(mock) {
m.render(root, new Field()) m.render(root, new Field())
return root.childNodes.length == 1 return root.childNodes.length == 1
}) })
test(function() {
var root = mock.document.createElement("div")
m.render(root, m("ul", [m("li")]))
var change = function() {
m.render(root, m("ul", arguments))
}
change(m("b"));
return root.childNodes[0].childNodes[0].nodeName == "B"
})
//end m.render //end m.render
//m.redraw //m.redraw
@ -1705,7 +1696,7 @@ function testMithril(mock) {
var scriptTag = [].slice.call(mock.document.getElementsByTagName("script")).filter(function(script){ var scriptTag = [].slice.call(mock.document.getElementsByTagName("script")).filter(function(script){
return script.src.indexOf(callbackKey) > -1 return script.src.indexOf(callbackKey) > -1
}).pop(); }).pop();
mock[callbackKey]({foo: "bar1"}) mock[callbackKey]({foo: "bar1"})//fixme ie
mock.document.removeChild(body); mock.document.removeChild(body);
return scriptTag.src.indexOf("/test?jsonpCallback=mithril_callback") > -1 && data.foo == "bar1"; return scriptTag.src.indexOf("/test?jsonpCallback=mithril_callback") > -1 && data.foo == "bar1";
}) })
@ -1857,7 +1848,7 @@ function testMithril(mock) {
deferred.resolve("test") deferred.resolve("test")
} }
catch (e) {value3 = e} catch (e) {value3 = e}
return value1 === undefined && value2 === undefined && value3 instanceof ReferenceError return value1 === undefined && value2 === undefined && (value3 instanceof ReferenceError || value3 instanceof TypeError)
}) })
test(function() { test(function() {
var deferred1 = m.deferred() var deferred1 = m.deferred()
@ -2026,11 +2017,6 @@ function testMithril(mock) {
return root.childNodes[0].nodeValue === "foo" return root.childNodes[0].nodeValue === "foo"
}) })
//console.log presence
test(function() {
return m.deps.factory.toString().indexOf("console") < 0
})
// config context // config context
test(function() { test(function() {
var root = mock.document.createElement("div") var root = mock.document.createElement("div")
@ -2060,16 +2046,13 @@ function testMithril(mock) {
return success; return success;
}) })
} //console.log presence
test(function() {
//test reporting for saucelabs return m.deps.factory.toString().indexOf("console") < 0
if (typeof window != "undefined") { })
window.global_test_results = { test(function() {
tests: [], return m.deps.factory.toString().indexOf("document.write") < 0
duration: 0, })
passed: 0,
failed: 0
};
} }
//mock //mock

36
tests/mock.js
View file

@ -1,3 +1,37 @@
if (!Array.prototype.indexOf) {
Array.prototype.indexOf = function(item) {
for (var i = 0; i < this.length; i++) {
if (this[i] === item) return i
}
return -1
}
}
if (!Array.prototype.map) {
Array.prototype.map = function(callback) {
var results = []
for (var i = 0; i < this.length; i++) {
results[i] = callback(this[i], i, this)
}
return results
}
}
if (!Array.prototype.filter) {
Array.prototype.filter = function(callback) {
var results = []
for (var i = 0; i < this.length; i++) {
if (callback(this[i], i, this)) results.push(this[i])
}
return results
}
}
if (!Object.keys) {
Object.keys = function() {
var keys = []
for (var i in this) keys.push(i)
return keys
}
}
var mock = {} var mock = {}
mock.window = new function() { mock.window = new function() {
var window = {} var window = {}
@ -77,7 +111,7 @@ mock.window = new function() {
var traverse = function(node){ var traverse = function(node){
if(node.childNodes && node.childNodes.length > 0){ if(node.childNodes && node.childNodes.length > 0){
node.childNodes.forEach(function(curr){ node.childNodes.map(function(curr){
if(curr.nodeName.toLowerCase() === name) if(curr.nodeName.toLowerCase() === name)
out.push(curr); out.push(curr);
traverse(curr); traverse(curr);

12
tests/test.js
View file

@ -1,3 +1,13 @@
//test reporting for saucelabs
if (typeof window != "undefined") {
window.global_test_results = {
tests: [],
duration: 0,
passed: 0,
failed: 0
};
}
if (!this.console) { if (!this.console) {
var log = function(value) {document.write("<pre>" + value + "</pre>")} var log = function(value) {document.write("<pre>" + value + "</pre>")}
this.console = {log: log, error: log} this.console = {log: log, error: log}
@ -13,7 +23,7 @@ function test(condition) {
start = performance.now() start = performance.now()
} }
try { try {
if (!condition()) throw new Error() if (!condition()) throw new Error("failed")
} }
catch (e) { catch (e) {
result = false result = false