Fix some problems with merge.

This commit is contained in:
xian
2009-08-14 18:04:52 -07:00
parent ab65914233
commit e9126fdd9b
3 changed files with 7 additions and 3 deletions

View File

@@ -20,6 +20,9 @@
<script type="text/javascript" src="../src/Suite.js"></script>
<script type="text/javascript" src="../src/mock-timeout.js"></script>
<script type="text/javascript" src="../lib/TrivialReporter.js"></script>
<script type="text/javascript">
jasmine.include('suites/EnvTest.js', true);
jasmine.include('suites/ExceptionsTest.js', true);
@@ -31,6 +34,7 @@
jasmine.include('suites/RunnerTest.js', true);
jasmine.include('suites/SpecRunningTest.js', true);
jasmine.include('suites/SpyTest.js', true);
jasmine.include('suites/TrivialReporterTest.js', true);
</script>
<link href="../lib/jasmine.css" rel="stylesheet"/>