Force nw process to end when tests fail.

* `gui.App.crashRenderer` does not end the NW.js app, causing `ember nw:test` to hang
* Also update nw-runner to not swallow diagnostic lines (even though they don't appear in the final output--something to investigate)

blueprints/node-webkit/files/nw-runner.js

@@ -1,29 +1,34 @@
 var exec = require('child_process').exec;
 var findNw = require('./node_modules/ember-cli-node-webkit/lib/helpers/find-nw');
+
 runNw(findNw({
  root: './'
 }));
 
 function runNw(nwPath) {
  var nw = exec(nwPath + ' ./dist/tests');
- nw.stdout.on('data', function (data) {
+ var hasErrors = false;
+
+ nw.stdout.on('data', function(data) {
  process.stdout.write(data);
  });
 
  // Cleanup nw.js output to be TAP (test anything protocol) compliant
- nw.stderr.on('data', function (data) {
+ nw.stderr.on('data', function(data) {
  if (data.indexOf('[qunit-logger]') > -1) {
- data = data.replace(/\[.*\] /g, "");
- data = data.replace(/\, source.*/g, "");
- data = data.replace(/\"/g, "");
- data = data.replace('[qunit-logger] ', '');
- console.log(data);
+ data = data.replace(/.*\[qunit-logger] (.*)"", source:.*/g, '$1');
+ data = data.replace(/\\n/g, '\n# ');
+ process.stdout.write(data);
+
+ if (data === '# done with errors') {
+ hasErrors = true;
+ }
  }
  });
 
- nw.on('exit', function (code) {
- setTimeout(function () {
- process.exit(code);
+ nw.on('exit', function(code) {
+ setTimeout(function() {
+ process.exit(hasErrors ? 1 : code);
  }, 2000);
  });
 }

blueprints/node-webkit/files/vendor/node-webkit/qunit-logger.js

@@ -1,6 +1,4 @@
-/* global define */
-/* global window */
-/* global QUnit */
+/* global define, window, QUnit */
 // dead stupid script to format test output from nw.js to the console
 define('vendor/node-webkit/qunit-logger', function () {
  function log(content) {
@@ -14,6 +12,7 @@ define('vendor/node-webkit/qunit-logger', function () {
  var totalTestCount = 0;
  var testCount = 0;
  var tests = {};
+
  QUnit.begin(function (details) {
  if (details.totalTests >= 1) {
  totalTestCount = details.totalTests;
@@ -32,13 +31,15 @@ define('vendor/node-webkit/qunit-logger', function () {
  QUnit.log(function (details) {
  if (details.result !== true) {
  var actualTestCount = testCount + 1;
+
  log('not ok ' + actualTestCount + ' - ' + details.module + ' - ' + details.name);
  log('# actual: -');
  log('# ' + details.actual);
  log('# expected: -');
  log('# ' + details.expected);
  log('# message: -');
  log('# ' + details.message);
+
  if (details.source) {
  log('# ' + details.source);
  }
@@ -50,14 +51,8 @@ define('vendor/node-webkit/qunit-logger', function () {
  }
  });
 
- QUnit.done(function (details) {
- var gui = require('nw.gui');
- if (details.failed === 0) {
- // quit with no error
- gui.App.quit();
- } else {
- // fail out
- gui.App.crashRenderer();
- }
+ QUnit.done(function(details) {
+ log('# done' + (details.failed === 0 ? '' : ' with errors'));
+ require('nw.gui').App.quit();
  });
-})();
+});