From 6e4c3913bf5c8638bb05c2a50ee51b6521818db9 Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Sun, 24 Nov 2019 22:12:54 -0800
Subject: [PATCH 1/3] getDir: test indicates file contents are buffer

so try a toString() on it
---
 .github/workflows/ci-test-win.yml | 2 +-
 .github/workflows/ci-test.yml     | 2 +-
 readers/binary.js                 | 2 +-
 readers/flat.js                   | 2 +-
 test/config.js                    | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-test-win.yml b/.github/workflows/ci-test-win.yml
index 92a764a..15a50a3 100644
--- a/.github/workflows/ci-test-win.yml
+++ b/.github/workflows/ci-test-win.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest ]
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [10.x, 12.x]
       fail-fast: false
 
     steps:
diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 8a80a9b..4fb1dfb 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        node-version: [8.x, 10.x, 12.x]
+        node-version: [10.x, 12.x]
       fail-fast: false
 
     steps:
diff --git a/readers/binary.js b/readers/binary.js
index d438fb8..1c0296b 100644
--- a/readers/binary.js
+++ b/readers/binary.js
@@ -7,7 +7,7 @@ exports.load = (name) => {
 }
 
 exports.loadPromise = (name) => {
-    return new Promise(function (resolve, reject) {
+    return new Promise((resolve, reject) => {
         fs.readFile(name, (err, content) => {
             if (err) return reject(err);
             resolve({ path: name, data: content });
diff --git a/readers/flat.js b/readers/flat.js
index da0d26b..2ff5c05 100644
--- a/readers/flat.js
+++ b/readers/flat.js
@@ -52,7 +52,7 @@ exports.load = (name, type, options, regex) => {
     return result;
 }
 
-exports.empty = function (options, type) {
+exports.empty = (options, type) => {
     switch (type) {
         case 'flat':
         case 'value':
diff --git a/test/config.js b/test/config.js
index 3bebf6f..c244418 100644
--- a/test/config.js
+++ b/test/config.js
@@ -464,11 +464,12 @@ describe('getDir', function () {
 
     it('loads all files in dir', function (done) {
         this.config.getDir('dir', { type: 'binary' }, (err, files) => {
+            assert.ifError(err);
             // console.log(files);
             assert.equal(err, null);
             assert.equal(files.length, 3);
-            assert.equal(files[0].data, 'contents1\n');
-            assert.equal(files[2].data, 'contents3\n');
+            assert.equal(files[0].data.toString(), 'contents1\n');
+            assert.equal(files[2].data.toString(), 'contents3\n');
             done();
         })
     })

From 1e83dfb1fb8c669b8577a710a1fdcc4f01a8f720 Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Sun, 24 Nov 2019 22:21:32 -0800
Subject: [PATCH 2/3] use os.EOL for comparison

---
 test/config.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/config.js b/test/config.js
index c244418..9f89445 100644
--- a/test/config.js
+++ b/test/config.js
@@ -1,7 +1,8 @@
 
 const assert = require('assert')
-const fs     = require('fs');
-const path   = require('path');
+const fs     = require('fs')
+const os     = require('os')
+const path   = require('path')
 
 function cb () { return false; }
 const opts = { booleans: ['arg1'] };
@@ -468,8 +469,8 @@ describe('getDir', function () {
             // console.log(files);
             assert.equal(err, null);
             assert.equal(files.length, 3);
-            assert.equal(files[0].data.toString(), 'contents1\n');
-            assert.equal(files[2].data.toString(), 'contents3\n');
+            assert.equal(files[0].data.toString(), `contents1${os.EOL}`);
+            assert.equal(files[2].data.toString(), `contents3${os.EOL}`);
             done();
         })
     })
@@ -499,8 +500,8 @@ describe('getDir', function () {
                 // console.log(files);
                 assert.equal(err, null);
                 assert.equal(files.length, 3);
-                assert.equal(files[0].data, 'contents1\n');
-                assert.equal(files[2].data, 'contents3\n');
+                assert.equal(files[0].data, `contents1${os.EOL}`);
+                assert.equal(files[2].data, `contents3${os.EOL}`);
                 fs.writeFile(tmpFile, 'contents4\n', (err2, res) => {
                     assert.equal(err2, null);
                     // console.log('file touched, waiting for callback');

From e124cf51cc11c9748b84ea1898f9aac594778671 Mon Sep 17 00:00:00 2001
From: Matt Simerson <matt@tnpi.net>
Date: Sun, 24 Nov 2019 22:26:15 -0800
Subject: [PATCH 3/3] revert toString()

---
 test/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/config.js b/test/config.js
index 9f89445..1f7801f 100644
--- a/test/config.js
+++ b/test/config.js
@@ -469,8 +469,8 @@ describe('getDir', function () {
             // console.log(files);
             assert.equal(err, null);
             assert.equal(files.length, 3);
-            assert.equal(files[0].data.toString(), `contents1${os.EOL}`);
-            assert.equal(files[2].data.toString(), `contents3${os.EOL}`);
+            assert.equal(files[0].data, `contents1${os.EOL}`);
+            assert.equal(files[2].data, `contents3${os.EOL}`);
             done();
         })
     })