Update stdout and stderror to be array of lines

alistairjcbrown · alistairjcbrown · commit 4dcbf96e7239 · 2017-01-08T19:53:14.000Z
diff --git a/test/BinTestCases.test.js b/test/BinTestCases.test.js
@@ -26,6 +26,11 @@ function getTestSpecificArguments(testDirectory) {
 	}
 }
 
+function convertToArrayOfLines(outputArray) {
+	if(outputArray.length === 0) return outputArray;
+	return outputArray.join('').split('\n');
+}
+
 const casesPath = path.join(__dirname, "binCases");
 const defaultArgs = loadOptsFile(path.join(casesPath, "test.opts"));
 
@@ -65,7 +70,8 @@ describe("BinTestCases", function() {
 				describe(testName, function() {
 					before(function(done) {
 						this.timeout(20000);
-						const child = spawn(cmd, args, opts);
+
+						const child = spawn(process.execPath, [cmd].concat(args), opts);
 
 						child.on("close", function(code) {
 							env.code = code;
@@ -90,7 +96,9 @@ describe("BinTestCases", function() {
 					});
 
 					it("should run successfully", function() {
-						testAssertions(env.code, env.stdout, env.stderr);
+						const stdout = convertToArrayOfLines(env.stdout);
+						const stderr = convertToArrayOfLines(env.stderr);
+						testAssertions(env.code, stdout, stderr);
 					});
 				});
 			});
diff --git a/test/binCases/help/help-output/test.js b/test/binCases/help/help-output/test.js
@@ -3,23 +3,17 @@
 module.exports = function testAssertions(code, stdout, stderr) {
 	code.should.be.exactly(0);
 
-	stdout.length.should.be.exactly(1);
-	const output = stdout[0].toString();
+	stdout.should.be.ok();
+	stdout[0].should.startWith("webpack");
+	stdout.should.containEql("Config options:");
+	stdout.should.containEql("Basic options:");
+	stdout.should.containEql("Module options:");
+	stdout.should.containEql("Output options:");
+	stdout.should.containEql("Advanced options:");
+	stdout.should.containEql("Resolving options:");
+	stdout.should.containEql("Optimizing options:");
+	stdout.should.containEql("Stats options:");
+	stdout.should.containEql("Options:");
 
-	output.should.be.ok();
-	output.should.startWith("webpack");
-	output.should.containEql("\nConfig options:");
-	output.should.containEql("\nBasic options:");
-	output.should.containEql("\nModule options:");
-	output.should.containEql("\nOutput options:");
-	output.should.containEql("\nAdvanced options:");
-	output.should.containEql("\nResolving options:");
-	output.should.containEql("\nOptimizing options:");
-	output.should.containEql("\nStats options:");
-	output.should.containEql("\nOptions:");
-
-	stderr.map((data) => {
-		data.toString().should.be.ok();
-		throw new Error(data.toString());
-	});
+	stderr.should.be.empty();
 }
diff --git a/test/binCases/stats/single-config/test.js b/test/binCases/stats/single-config/test.js
@@ -3,23 +3,13 @@
 module.exports = function testAssertions(code, stdout, stderr) {
 	code.should.be.oneOf(0, 1);
 
-	stdout.length.should.be.exactly(2);
-
-	const dateOutput = stdout[0].toString();
-	dateOutput.should.be.ok();
-	isNaN(new Date(dateOutput)).should.be.false();
-
-	const buildOutput = stdout[1].toString();
-	buildOutput.should.be.ok();
-	buildOutput.should.startWith("Hash: ");
-	buildOutput.should.containEql("\nVersion:");
-	buildOutput.should.containEql("\nTime:");
-	buildOutput.should.containEql("null.js");
-	buildOutput.should.containEql("./index.js");
-	buildOutput.should.containEql("[built]");
-
-	stderr.map((data) => {
-		data.toString().should.be.ok();
-		throw new Error(data.toString());
-	});
+	stdout.should.be.ok();
+	stdout[3].should.containEql("Hash: ");
+	stdout[4].should.containEql("Version: ");
+	stdout[5].should.containEql("Time: ");
+	stdout[7].should.containEql("null.js");
+	stdout[8].should.containEql("./index.js");
+	stdout[8].should.containEql("[built]");
+
+	stderr.should.be.empty();
 }
