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

merge to next

Browse source
This commit is contained in:
Leo 2017-01-30 11:04:14 -05:00
commit 6ab2b6b6c3
31 changed files with 17724 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/index.html
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
<!DOCTYPE html>
<html>
<head>
@ -15,6 +16,20 @@
<script src="../test-utils/browserMock.js"></script>
<script src="../mithril.js"></script>
<script src="test-api.js"></script>
=======
<!doctype html>
<!--<script src="https://cdnjs.cloudflare.com/ajax/libs/es5-shim/4.0.3/es5-shim.min.js"></script>-->
<script src="test.js"></script>
<script src="mock.js"></script>
<script src="../mithril.js"></script>
<script src="mithril-tests.js"></script>
<script>
// shim for running the old test suite with grunt-mocha-phantomjs like the new one
if ('callPhantom' in window) {
window.callPhantom({ testRunEnded: 1})
}
</script>
>>>>>>> origin/next
<script>require("../ospec/ospec").run()</script>
</body>

5611
tests/mithril-tests.js Normal file
View file

File diff suppressed because it is too large Load diff