Merge branch 'master' into next

Conflicts:
	tests/mithril-tests.js
This commit is contained in:
Leo Horie 2014-08-02 16:09:45 -04:00
commit da0383cad3
8 changed files with 220 additions and 17 deletions

View file

@ -1575,7 +1575,17 @@ function testMithril(mock) {
}
//mocks
testMithril(mock.window)
//test reporting for saucelabs
if (typeof window != "undefined") {
window.global_test_results = {
tests: [],
duration: 0,
passed: 0,
failed: 0
};
}
//mock
testMithril(mock.window);
test.print(function(value) {console.log(value)})