jasmine-dom
Advanced tools
Comparing version 0.2.2 to 0.2.3
@@ -14,4 +14,9 @@ var fs = require('fs'), | ||
this.isTestRunQueued = false; | ||
this.reporter = this._setupReporter(); // async | ||
this.reporter = this._setupReporter(function(){ | ||
callback(); | ||
}); // async | ||
if(doServer){ | ||
@@ -35,3 +40,2 @@ this.server = that._setupServer({ | ||
} | ||
}; | ||
@@ -45,2 +49,3 @@ | ||
console.debug("Reporter created."); | ||
callback(); | ||
} | ||
@@ -152,3 +157,3 @@ }); | ||
exports.run = function(options){ | ||
exports.run = function(options, callback){ | ||
var onDone = options.onDone || function(){}, | ||
@@ -159,5 +164,16 @@ debug = options.debug; | ||
var runner = new JasmineRunner(options); | ||
runner.runTests(onDone); | ||
return runner; | ||
process.on('uncaughtException', function(err){ | ||
if(debug){ | ||
console.debug("An uncaught error occured!"); | ||
console.error(err.message + "\n",err.stack); | ||
} else { | ||
console.error("An error occurred while running the tests. Use the --debug switch to find out more.") | ||
exit(1); | ||
} | ||
}); | ||
var runner = new JasmineRunner(options, function(){ | ||
runner.runTests(onDone); | ||
callback( runner ); | ||
}); | ||
}; |
@@ -51,3 +51,3 @@ function Runner( options ){ | ||
Runner.prototype._executeRunner = function(pathToHtml, scripts, reporter, callback){ | ||
console.debug("Executing runner with following scripts: "); | ||
console.debug("Constructing runner with following scripts: "); | ||
for(var i = 0; i < scripts.length; i++) console.debug(" - " + scripts[i]); | ||
@@ -74,2 +74,3 @@ | ||
console.debug("Running runner in Jasmine."); | ||
window.jasmine.getEnv().execute(); | ||
@@ -76,0 +77,0 @@ |
{ | ||
"name" : "jasmine-dom" | ||
, "version" : "0.2.2" | ||
, "version" : "0.2.3" | ||
@@ -16,3 +16,6 @@ , "description" : "Run your jasmine html SpecRunner in node.js." | ||
"node-static" : "0.5.7", | ||
"yaml" : "0.2.1" | ||
"yaml" : "0.2.1", | ||
"request" : "2.0.2", | ||
"cssom" : "0.2.0", | ||
"htmlparser" : "1.7.3" | ||
} | ||
@@ -19,0 +22,0 @@ , "bin" : "bin/jasmine-dom" |
@@ -50,9 +50,11 @@ node-jasmine-dom | ||
--- | ||
test_one: | ||
name: This is the name of the first set of tests | ||
runner: path/to/runner_1.html | ||
test_two: | ||
name: This is the name of the second set of tests | ||
runner: path/to/another/runner.html | ||
```yaml | ||
--- | ||
test_one: | ||
name: This is the name of the first set of tests | ||
runner: path/to/runner_1.html | ||
test_two: | ||
name: This is the name of the second set of tests | ||
runner: path/to/another/runner.html | ||
``` | ||
@@ -59,0 +61,0 @@ The config file allows you to provide names for your runners. These names will be used when identifying failing tests. |
363525
5866
132
6
+ Addedcssom@0.2.0
+ Addedhtmlparser@1.7.3
+ Addedrequest@2.0.2
+ Addedcssom@0.2.0(transitive)
+ Addedhtmlparser@1.7.3(transitive)
+ Addedrequest@2.0.2(transitive)
- Removedajv@6.12.6(transitive)
- Removedasn1@0.2.6(transitive)
- Removedassert-plus@1.0.0(transitive)
- Removedasynckit@0.4.0(transitive)
- Removedaws-sign2@0.7.0(transitive)
- Removedaws4@1.13.0(transitive)
- Removedbcrypt-pbkdf@1.0.2(transitive)
- Removedcaseless@0.12.0(transitive)
- Removedcombined-stream@1.0.8(transitive)
- Removedcore-util-is@1.0.2(transitive)
- Removedcssom@0.5.0(transitive)
- Removeddashdash@1.14.1(transitive)
- Removeddelayed-stream@1.0.0(transitive)
- Removedecc-jsbn@0.1.2(transitive)
- Removedextend@3.0.2(transitive)
- Removedextsprintf@1.3.0(transitive)
- Removedfast-deep-equal@3.1.3(transitive)
- Removedfast-json-stable-stringify@2.1.0(transitive)
- Removedforever-agent@0.6.1(transitive)
- Removedform-data@2.3.3(transitive)
- Removedgetpass@0.1.7(transitive)
- Removedhar-schema@2.0.0(transitive)
- Removedhar-validator@5.1.5(transitive)
- Removedhtmlparser@1.7.7(transitive)
- Removedhttp-signature@1.2.0(transitive)
- Removedis-typedarray@1.0.0(transitive)
- Removedisstream@0.1.2(transitive)
- Removedjsbn@0.1.1(transitive)
- Removedjson-schema@0.4.0(transitive)
- Removedjson-schema-traverse@0.4.1(transitive)
- Removedjson-stringify-safe@5.0.1(transitive)
- Removedjsprim@1.4.2(transitive)
- Removedmime-db@1.52.0(transitive)
- Removedmime-types@2.1.35(transitive)
- Removedoauth-sign@0.9.0(transitive)
- Removedperformance-now@2.1.0(transitive)
- Removedpsl@1.9.0(transitive)
- Removedpunycode@2.3.1(transitive)
- Removedqs@6.5.3(transitive)
- Removedrequest@2.88.2(transitive)
- Removedsafe-buffer@5.2.1(transitive)
- Removedsafer-buffer@2.1.2(transitive)
- Removedsshpk@1.18.0(transitive)
- Removedtough-cookie@2.5.0(transitive)
- Removedtunnel-agent@0.6.0(transitive)
- Removedtweetnacl@0.14.5(transitive)
- Removeduri-js@4.4.1(transitive)
- Removeduuid@3.4.0(transitive)
- Removedverror@1.10.0(transitive)