Merge remote-tracking branch 'origin/master'

This commit is contained in:
Leo Horie 2014-03-31 16:07:38 -04:00
commit 26a063e4c3
4 changed files with 18 additions and 1 deletions

6
.travis.yml Normal file
View file

@ -0,0 +1,6 @@
language: node_js
node_js:
- "0.10"
script:
- grunt test

View file

@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/lhorie/mithril.js.svg?branch=master)](https://travis-ci.org/lhorie/mithril.js)
# Mithril
A Javascript Framework for Building Brilliant Applications

View file

@ -432,7 +432,12 @@ test.print = function(print) {
print(test.failures[i].toString())
}
print("tests: " + test.total + "\nfailures: " + test.failures.length)
if (test.failures.length > 0) {
throw new Error(test.failures.length + " tests did not pass")
}
}
var mock = {}
mock.window = new function() {
var window = {}

View file

@ -10,4 +10,8 @@ test.print = function(print) {
print(test.failures[i].toString())
}
print("tests: " + test.total + "\nfailures: " + test.failures.length)
}
if (test.failures.length > 0) {
throw new Error(test.failures.length + " tests did not pass")
}
}