Merge branch 'master' of github.com:busterjs/buster

busterjs · Jul 5, 2012 · 062aad2 · 062aad2
2 parents 7f452d1 + fa5c39d
commit 062aad2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/buster/capture-server-wiring.js b/lib/buster/capture-server-wiring.js
@@ -1,9 +1,12 @@
 (function (B) {
     function wireTestRunner(emitter) {
-        var runner = B.testRunner.create();
-        var reporter = B.reporters.jsonProxy.create(emitter);
-        reporter.listen(runner);
-        var wiring = B.wire.testRunner(runner);
+
+        var wiring = B.wire.testRunner(function () {
+            var runner = B.testRunner.create();
+            var reporter = B.reporters.jsonProxy.create(emitter);
+            reporter.listen(runner);
+            return runner;
+        });
         B.run = wiring.run;
 
         emitter.on("tests:run", function (msg) {

diff --git a/script/phantom.js b/script/phantom.js
@@ -1,5 +1,5 @@
 var system = require('system'),
-    captureUrl = 'http://localhost:1111/capture/';
+    captureUrl = 'http://localhost:1111/capture';
 if (system.args.length==2) {
     captureUrl = system.args[1];
 }
@@ -9,8 +9,12 @@ phantom.silent = false;
 var page = new WebPage();
 
 page.open(captureUrl, function(status) {
-  if(!phantom.silent){
+  if(!phantom.silent) {
     console.log(status);
+    if (status !== 'success') {
+      console.log('phantomjs failed to connect');
+      phantom.exit(1);
+    }
 
     page.onConsoleMessage = function (msg, line, id) {
       var fileName = id.split('/');