Fix jasmine runners to work better with requirejs and join all specs in one
Change-Id: Id6b1de7c0bf87efa564db496c5dc4fb001f31c18
diff --git a/dev/js/runner/vc.html b/dev/js/runner/vc.html
index 2653bb4..b71302b 100644
--- a/dev/js/runner/vc.html
+++ b/dev/js/runner/vc.html
@@ -5,25 +5,34 @@
<title>Spec Runner for Virtual Collection Builder</title>
<link rel="shortcut icon" type="image/png" href="../lib/jasmine-2.1.1/jasmine_favicon.png">
<link rel="stylesheet" href="../lib/jasmine-2.1.1/jasmine.css">
- <script src="../lib/require.js"></script>
- <script src="../lib/jasmine-2.1.1/jasmine.js"></script>
- <script src="../lib/jasmine-2.1.1/jasmine-html.js"></script>
- <script src="../lib/jasmine-2.1.1/boot.js"></script>
- <script>
+ <script src="../lib/require.js"></script>
+ <script>
require.config({
baseUrl: "../src",
paths: {
"lib" : "../lib",
- "spec" : "../spec"
+ "spec" : "../spec",
+ "jlib" : "lib/jasmine-2.1.1",
+ "jasmine" : ['../lib/jasmine-2.1.1/jasmine'],
+ "jasmine-html": ['../lib/jasmine-2.1.1/jasmine-html'],
+ "jasmine-boot": ['../lib/jasmine-2.1.1/boot']
+ },
+ shim : {
+ 'jasmine-html' : {
+ deps : ['jasmine']
+ },
+ 'jasmine-boot' : {
+ deps : ['jasmine','jasmine-html']
+ }
}
});
- require([
- 'lib/domReady!',
- 'spec/vcSpec'
- ],
- function () {
- if (jsApiReporter.finished === true)
- jasmine.getEnv().execute();
+ require(['jasmine-boot'], function () {
+ require([
+ 'spec/vcSpec'
+ ],
+ function () {
+ window.onload();
+ });
});
</script>
</head>