Skip to content
Open
Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ node_modules/karma/node_modules/socket.io/node_modules/socket.io-client/node_mod
# Selenium WebDriverJS: Optional dependencies that don't build on vanilla Windows
node_modules/selenium-webdriver/node_modules/ws/node_modules/bufferutil/
node_modules/selenium-webdriver/node_modules/ws/node_modules/utf-8-validate/



# Maas Sublime ignores
*.sublime-project
*.sublime-workspace
11 changes: 9 additions & 2 deletions src/_run_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,20 @@
return run("inherit");
};

exports.runProgrammatically = function(callback) {
var serverProcess = run(["pipe", "pipe", process.stderr]);
exports.runProgrammatically = function(callback, errorCallback) {
var serverProcess = run(["pipe", "pipe", "pipe"]);

serverProcess.stdout.setEncoding("utf8");
serverProcess.stdout.on("data", function(chunk) {
if (chunk.trim().indexOf("Server started") !== -1) callback(serverProcess);
});

serverProcess.stderr.setEncoding("utf8");
serverProcess.stderr.on("data", function(chunk) {
var proc = parseProcFile();
var error = new Error("Spawning '" + proc.command + " " + proc.options + "' failed.");
errorCallback(error);
});
};

function run(stdioOptions) {
Expand Down
5 changes: 3 additions & 2 deletions src/_smoke_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
before(function (done) {
runServer.runProgrammatically(function(process) {
serverProcess = process;

driver = new firefox.Driver();
driver.getCapabilities().then(function(capabilities) {
var version = capabilities.get("browserName") + " " + capabilities.get("version");
Expand All @@ -32,10 +31,12 @@
}
done();
});
});
}, done);
});

after(function(done) {
if (serverProcess === undefined)
return done();
serverProcess.on("exit", function(code, signal) {
driver.quit().then(done);
});
Expand Down