tests: change all windows line endings to unix ones

This commit is contained in:
Sebastian McKenzie 2014-11-11 13:30:19 +11:00
parent e0d620b1d5
commit c6ae33c5a2
2 changed files with 8 additions and 9 deletions

View File

@ -5,9 +5,11 @@ var humanise = function (val) {
return val.replace(/-/g, " "); return val.replace(/-/g, " ");
}; };
var readFile = function (filename) { var readFile = exports.readFile = function (filename) {
if (fs.existsSync(filename)) { if (fs.existsSync(filename)) {
return fs.readFileSync(filename, "utf8").trim(); var file = fs.readFileSync(filename, "utf8").trim();
file = file.replace(/\r\n/g, "\n");
return file;
} else { } else {
return ""; return "";
} }

View File

@ -1,4 +1,5 @@
var readdir = require("fs-readdir-recursive"); var readdir = require("fs-readdir-recursive");
var helper = require("./_helper");
var assert = require("assert"); var assert = require("assert");
var rimraf = require("rimraf"); var rimraf = require("rimraf");
var mkdirp = require("mkdirp"); var mkdirp = require("mkdirp");
@ -11,15 +12,11 @@ var _ = require("lodash");
var fixtureLoc = __dirname + "/fixtures/bin"; var fixtureLoc = __dirname + "/fixtures/bin";
var tmpLoc = __dirname + "/tmp"; var tmpLoc = __dirname + "/tmp";
var readFile = function (filename) {
return fs.readFileSync(filename, "utf8").trim();
};
var readDir = function (loc) { var readDir = function (loc) {
var files = {}; var files = {};
if (fs.existsSync(loc)) { if (fs.existsSync(loc)) {
_.each(readdir(loc), function (filename) { _.each(readdir(loc), function (filename) {
var contents = readFile(loc + "/" + filename); var contents = helper.readFile(loc + "/" + filename);
files[filename] = contents; files[filename] = contents;
}); });
} }
@ -63,7 +60,7 @@ var assertTest = function (stdout, stderr, opts) {
} }
_.each(opts.outFiles, function (expect, filename) { _.each(opts.outFiles, function (expect, filename) {
var actual = readFile(filename); var actual = helper.readFile(filename);
chai.expect(actual).to.equal(expect, "out-file " + filename); chai.expect(actual).to.equal(expect, "out-file " + filename);
}); });
}; };
@ -138,7 +135,7 @@ _.each(fs.readdirSync(fixtureLoc), function (binName) {
_.each(["stdout", "stdin", "stderr"], function (key) { _.each(["stdout", "stdin", "stderr"], function (key) {
var loc = testLoc + "/" + key + ".txt"; var loc = testLoc + "/" + key + ".txt";
if (fs.existsSync(loc)) { if (fs.existsSync(loc)) {
opts[key] = readFile(loc); opts[key] = helper.readFile(loc);
} else { } else {
opts[key] = opts[key] || ""; opts[key] = opts[key] || "";
} }