From 892a1dc97c03988d11f4245783e901488eeb6c82 Mon Sep 17 00:00:00 2001
From: Nate Fischer <ntfschr@google.com>
Date: Sat, 17 Mar 2018 01:57:12 -0700
Subject: [PATCH] test: fix more Windows tests.

This fixes some tests on Windows, some of which I actually broke in a
previous PR. This focuses on newlines: we need `\n` when comparing
against JavaScript strings, but `os.EOL` when comparing something from
the file system or the system's stdio.

Issue #7
---
 test/test.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/test.js b/test/test.js
index 6b4ee8a..0647c27 100644
--- a/test/test.js
+++ b/test/test.js
@@ -141,7 +141,9 @@ describe('proxy', () => {
         const ret2 = shell.exec(`du ${fname}`);
         assertShellStringEqual(ret1, ret2);
         // Don't assert the file size, since that may be OS dependent.
-        ret1.stdout.should.endWith(`\t${fname}${os.EOL}`);
+        // Note: newline should be '\n', because we're checking a JS string, not
+        // something from the file system.
+        ret1.stdout.should.endWith(`\t${fname}\n`);
       } else {
         console.log('skipping test');
       }
@@ -223,7 +225,9 @@ describe('proxy', () => {
     it('runs very long subcommand chains', (done) => {
       const fun = (unix() ? shell.$output : shell['%output%']);
       const ret = fun.one.two.three.four.five.six('seven');
-      ret.stdout.should.equal(`one two three four five six seven${os.EOL}`);
+      // Note: newline should be '\n', because we're checking a JS string, not
+      // something from the file system.
+      ret.stdout.should.equal('one two three four five six seven\n');
       ret.stderr.should.equal('');
       ret.code.should.equal(0);
       done();
@@ -240,6 +244,7 @@ describe('proxy', () => {
       shell.exec('echo hello world').to(fname);
 
       shell[delVarName](fname);
+      // TODO(nfischer): this line fails on Windows
       fs.existsSync(fname).should.equal(false);
       shell.cat(fa).toString().should.equal(`hello world${os.EOL}`);