cli tests are passing

Author: dignifiedquire

src/cli/commands/files/get.js

@@ -103,7 +103,6 @@ module.exports = {
           toPull.source(stream),
           pull.asyncMap(fileHandler(dir)),
           pull.onEnd((err) => {
-            console.log('finished writing')
             if (err) {
               throw err
             }

src/http-api/resources/files.js

@@ -10,7 +10,7 @@ const pull = require('pull-stream')
 const toPull = require('stream-to-pull-stream')
 const pushable = require('pull-pushable')
 const EOL = require('os').EOL
-const through = require('through2')
+const toStream = require('pull-stream-to-stream')
 
 exports = module.exports
 
@@ -87,33 +87,35 @@ exports.get = {
 
       pull(
         stream,
-        pull.asyncMap((file) => {
-        const header = {name: file.path}
-        if (!file.content) {
-          header.type = 'directory'
-          pack.entry(header)
-          cb()
-        } else {
-          header.size = file.size
-          const packStream = pack.entry(header, cb)
-          if (!packStream) {
-            // this happens if the request is aborted
-            // we just skip things then
-            log('other side hung up')
-            return cb()
+        pull.asyncMap((file, cb) => {
+          const header = {name: file.path}
+          if (!file.content) {
+            header.type = 'directory'
+            pack.entry(header)
+            cb()
+          } else {
+            header.size = file.size
+            const packStream = pack.entry(header, cb)
+            if (!packStream) {
+              // this happens if the request is aborted
+              // we just skip things then
+              log('other side hung up')
+              return cb()
+            }
+            toStream.source(file.content).pipe(packStream)
           }
-          file.content.pipe(packStream)
-        }
-      }), (err) => {
-        if (err) {
-          log.error(err)
-          pack.emit('error', err)
-          pack.destroy()
-          return
-        }
-        console.log('finalizinng')
-        pack.finalize()
-      })
+        }),
+        pull.onEnd((err) => {
+          if (err) {
+            log.error(err)
+            pack.emit('error', err)
+            pack.destroy()
+            return
+          }
+
+          pack.finalize()
+        })
+      )
 
       // the reply must read the tar stream,
       // to pull values through

test/cli/test-files.js

@@ -8,7 +8,7 @@ const fs = require('fs')
 const path = require('path')
 const describeOnlineAndOffline = require('../utils/on-and-off')
 
-describe.only('files', () => {
+describe('files', () => {
   const env = _.clone(process.env)
   env.IPFS_PATH = repoPath
   const ipfs = require('../utils/ipfs')(env)

test/utils/ipfs.js

@@ -10,11 +10,7 @@ module.exports = (env) => function ipfs () {
     env: env,
     timeout: 60 * 1000
   }).then((res) => {
-    expect(res).to.have.property('stderr', '')
-
-    if (res.error) {
-      throw res.error
-    }
+    expect(res.stderr).to.be.eql('')
 
     return res.stdout
   })