Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Commands/Run File or Spec.tmCommand
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@

// NOTE: This original implementation has support for running node.js/express web application jspec test files. This will be extracted into a separate bundle + command at some stage.

var sys = require("sys");
if(process.ENV.TM_FILENAME.match(/(.*)spec\.js/)) {
require.paths.unshift(process.ENV.TM_BUNDLE_SUPPORT + '/spec/lib');
if (typeof process.ENV.TM_PROJECT_DIRECTORY != "undefined" && process.ENV.TM_PROJECT_DIRECTORY != null && process.ENV.TM_PROJECT_DIRECTORY != "") {
require.paths.unshift(process.ENV.TM_PROJECT_DIRECTORY + '/lib');
require.paths.unshift(process.ENV.TM_PROJECT_DIRECTORY + '/src');
require.paths.unshift(process.ENV.TM_PROJECT_DIRECTORY + '/spec');
var util = require("util");
if(process.env.TM_FILENAME.match(/(.*)spec\.js/)) {
require.paths.unshift(process.env.TM_BUNDLE_SUPPORT + '/spec/lib');
if (typeof process.env.TM_PROJECT_DIRECTORY != "undefined" && process.env.TM_PROJECT_DIRECTORY != null && process.env.TM_PROJECT_DIRECTORY != "") {
require.paths.unshift(process.env.TM_PROJECT_DIRECTORY + '/lib');
require.paths.unshift(process.env.TM_PROJECT_DIRECTORY + '/src');
require.paths.unshift(process.env.TM_PROJECT_DIRECTORY + '/spec');
}
require("jspec");

Expand All @@ -34,24 +34,24 @@ if(process.ENV.TM_FILENAME.match(/(.*)spec\.js/)) {
};

GLOBAL.console = {
log: sys.puts,
warn: sys.puts,
error: sys.puts,
log: util.puts,
warn: util.puts,
error: util.puts,
group: function(){},
groupEnd: function(){}
};
JSpec.exec(process.ENV.TM_FILEPATH);
JSpec.exec(process.env.TM_FILEPATH);
JSpec.run({ formatter: JSpec.formatters.Console, failuresOnly: true });
JSpec.report();

} else {
var spawn = require('child_process').spawn;
var script = spawn("node", [process.ENV.TM_FILEPATH]);
var script = spawn("node", [process.env.TM_FILEPATH]);
script.stdout.on("data", function(data) {
if (data !== null) { sys.puts(data); }
if (data !== null) { util.puts(data); }
});
script.stderr.on("data", function(data) {
if (data !== null) { sys.puts("ERROR: " + data); }
if (data !== null) { util.puts("ERROR: " + data); }
});
}
</string>
Expand Down