test updates

Author: hackergrrl

src/files.js

@@ -8,9 +8,10 @@ const path = require('path')
 const fs = require('fs')
 const isNode = require('detect-node')
 const concat = require('concat-stream')
+const through = require('through2')
 
 module.exports = (common) => {
-  describe.only('.files', () => {
+  describe('.files', () => {
     let smallFile
     let bigFile
     let ipfs
@@ -310,7 +311,7 @@ module.exports = (common) => {
           expect(err).to.not.exist
           stream.pipe(concat((files) => {
             expect(files).to.be.length(1)
-            expect(files[0].path).to.deep.equal(mhBuf)
+            expect(files[0].path).to.deep.equal(hash)
             files[0].content.pipe(concat((content) => {
               expect(content.toString()).to.contain('Check out some of the other files in this directory:')
               done()
@@ -323,13 +324,22 @@ module.exports = (common) => {
         const hash = 'Qme79tX2bViL26vNjPsF3DP1R9rMKMvnPYJiKTTKPrXJjq'
         ipfs.files.get(hash, (err, stream) => {
           expect(err).to.not.exist
-          stream.pipe(concat((files) => {
-            expect(files).to.be.length(1)
-            expect(files[0].path).to.equal(hash)
-            files[0].content.pipe(concat((content) => {
-              expect(content).to.deep.equal(bigFile)
-              done()
+
+          // accumulate the files and their content
+          var files = []
+          stream.pipe(through.obj((file, enc, next) => {
+            file.content.pipe(concat((content) => {
+              files.push({
+                path: file.path,
+                content: content
+              })
+              next()
             }))
+          }, () => {
+            expect(files.length).to.equal(1)
+            expect(files[0].path).to.equal(hash)
+            expect(files[0].content).to.deep.equal(bigFile)
+            done()
           }))
         })
       })
@@ -338,21 +348,35 @@ module.exports = (common) => {
         const hash = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
         ipfs.files.get(hash, (err, stream) => {
           expect(err).to.not.exist
-          stream.pipe(concat((files) => {
-            expect(files).to.be.length(8)
+
+          // accumulate the files and their content
+          var files = []
+          stream.pipe(through.obj((file, enc, next) => {
+            file.content.pipe(concat((content) => {
+              files.push({
+                path: file.path,
+                content: content
+              })
+              next()
+            }))
+          }, () => {
+            expect(files).to.be.length(10)
             var paths = files.map((file) => {
               return file.path
             })
             expect(paths).to.deep.equal([
+              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP',
               'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
               'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
+              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
+              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files/empty',
+              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files/hello.txt',
+              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files/ipfs.txt',
               'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
               'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
               'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
-              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files/empty',
-              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files/hello.txt',
-              'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files/ipfs.txt'
             ])
+            done()
           }))
         })
       })