diff --git a/test/_helper.js b/test/_helper.js index 43c9d2af01..8de9f92bf4 100644 --- a/test/_helper.js +++ b/test/_helper.js @@ -5,9 +5,11 @@ var humanise = function (val) { return val.replace(/-/g, " "); }; -var readFile = function (filename) { +var readFile = exports.readFile = function (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 { return ""; } diff --git a/test/bin.js b/test/bin.js index ab88957b33..752b3d6490 100644 --- a/test/bin.js +++ b/test/bin.js @@ -1,4 +1,5 @@ var readdir = require("fs-readdir-recursive"); +var helper = require("./_helper"); var assert = require("assert"); var rimraf = require("rimraf"); var mkdirp = require("mkdirp"); @@ -11,15 +12,11 @@ var _ = require("lodash"); var fixtureLoc = __dirname + "/fixtures/bin"; var tmpLoc = __dirname + "/tmp"; -var readFile = function (filename) { - return fs.readFileSync(filename, "utf8").trim(); -}; - var readDir = function (loc) { var files = {}; if (fs.existsSync(loc)) { _.each(readdir(loc), function (filename) { - var contents = readFile(loc + "/" + filename); + var contents = helper.readFile(loc + "/" + filename); files[filename] = contents; }); } @@ -63,7 +60,7 @@ var assertTest = function (stdout, stderr, opts) { } _.each(opts.outFiles, function (expect, filename) { - var actual = readFile(filename); + var actual = helper.readFile(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) { var loc = testLoc + "/" + key + ".txt"; if (fs.existsSync(loc)) { - opts[key] = readFile(loc); + opts[key] = helper.readFile(loc); } else { opts[key] = opts[key] || ""; }