add new data file to mixed tests

mhkeller · Nov 16, 2015 · e9ce3f6 · e9ce3f6
1 parent 32615fb
commit e9ce3f6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 17 deletions.
diff --git a/test/data/mixed/data-1.csv b/test/data/mixed/data-1.csv
@@ -1,12 +1,3 @@
-[
-  {
-    "name": "jim",
-    "occupation": "land surveyor",
-    "age": 70
-  },
-  {
-    "name": "francis",
-    "occupation": "conductor",
-    "age": 63
-  }
-]
+name,occupation,age
+erika,land surveyor,50
+quentin,conductor,23
diff --git a/test/data/mixed/data-1.json b/test/data/mixed/data-1.json
@@ -0,0 +1,12 @@
+[
+  {
+    "name": "erika",
+    "occupation": "land surveyor",
+    "age": 50
+  },
+  {
+    "name": "quentin",
+    "occupation": "conductor",
+    "age": 23
+  }
+]
diff --git a/test/test.js b/test/test.js
@@ -315,8 +315,7 @@ describe('readdirFilter()', function () {
     it('should match expected out', function (done) {
       var dir = path.join(__dirname, 'data', 'mixed')
       io.readdirFilter(dir, {exclude: 'tsv'}, function (err, files) {
-        // console.log('files', files)
-        assert(_.isEqual(JSON.stringify(files), '[".hidden-file","data-0.csv","data-0.json","data-1.csv"]'))
+        assert(_.isEqual(JSON.stringify(files), '[".hidden-file","data-0.csv","data-0.json","data-1.csv","data-1.json"]'))
         if (err) {
           console.error(err)
         }
@@ -329,7 +328,7 @@ describe('readdirFilter()', function () {
     it('match expected output', function (done) {
       var dir = path.join(__dirname, 'data', 'mixed')
       io.readdirFilter(dir, {exclude: ['tsv', 'csv']}, function (err, files) {
-        assert(_.isEqual(JSON.stringify(files), '[".hidden-file","data-0.json"]'))
+        assert(_.isEqual(JSON.stringify(files), '[".hidden-file","data-0.json","data-1.json"]'))
         if (err) {
           console.error(err)
         }
@@ -343,7 +342,7 @@ describe('readdirFilter()', function () {
     it('match expected output', function (done) {
       var dir = path.join(__dirname, 'data', 'mixed')
       io.readdirFilter(dir, {exclude: ['tsv', 'csv'], include: /^data/}, function (err, files) {
-        assert(_.isEqual(JSON.stringify(files), '["data-0.json"]'))
+        assert(_.isEqual(JSON.stringify(files), '["data-0.json","data-1.json"]'))
         if (err) {
           console.error(err)
         }
@@ -353,11 +352,25 @@ describe('readdirFilter()', function () {
     })
   })
 
+  // describe('include all', function () {
+  //   it('match expected output', function (done) {
+  //     var dir = path.join(__dirname, 'data', 'mixed')
+  //     io.readdirFilter(dir, {include: ['tsv', 'csv'], include: /^data/}, function (err, files) {
+  //       assert(_.isEqual(JSON.stringify(files), '["data-0.json"]'))
+  //       if (err) {
+  //         console.error(err)
+  //       }
+  //       done()
+  //     })
+
+  //   })
+  // })
+
   describe('exclude by extension list and regex', function () {
     it('match expected output', function (done) {
       var dir = path.join(__dirname, 'data', 'mixed')
       io.readdirFilter(dir, {exclude: ['tsv', 'csv', /^\./]}, function (err, files) {
-        assert(_.isEqual(JSON.stringify(files), '["data-0.json"]'))
+        assert(_.isEqual(JSON.stringify(files), '["data-0.json","data-1.json"]'))
         if (err) {
           console.error(err)
         }