send the options for file and pin operations that hit 'send-files-str…

…eam' under the 'qs' key. Allows any options passed to ipfs.file|pin.add-ish to be turned into qs params instead of adding all of them individually

src/files/add-pull-stream.js

@@ -3,4 +3,5 @@
 const SendFilesStream = require('../utils/send-files-stream')
 const toPull = require('stream-to-pull-stream')
 
-module.exports = (send) => (options) => toPull(SendFilesStream(send, 'add')(options))
+module.exports = (send) => (options) =>
+  toPull(SendFilesStream(send, 'add')({ qs: options }))

src/files/add.js

@@ -33,7 +33,7 @@ module.exports = (send) => {
 
     const files = [].concat(_files)
 
-    const stream = createAddStream(options)
+    const stream = createAddStream({ qs: options })
     const concat = ConcatStream((result) => callback(null, result))
     stream.once('error', callback)
     stream.pipe(concat)

src/files/write.js

@@ -31,7 +31,7 @@ module.exports = (send) => {
       qs: opts
     }
 
-    const stream = sendFilesStream(options)
+    const stream = sendFilesStream({ qs: options })
     const concat = concatStream((result) => callback(null, result))
     stream.once('error', callback)
     stream.pipe(concat)

test/files.spec.js

@@ -127,6 +127,42 @@ describe('.files (the MFS API part)', function () {
     })
   })
 
+  it('files.add pins by default', (done) => {
+    const newContent = Buffer.from(String(Math.random()))
+
+    ipfs.pin.ls((err, pins) => {
+      expect(err).to.not.exist()
+      const initialPinCount = pins.length
+      ipfs.files.add(newContent, (err, res) => {
+        expect(err).to.not.exist()
+
+        ipfs.pin.ls((err, pins) => {
+          expect(err).to.not.exist()
+          expect(pins.length).to.eql(initialPinCount + 1)
+          done()
+        })
+      })
+    })
+  })
+
+  it('files.add with pin=false', (done) => {
+    const newContent = Buffer.from(String(Math.random()))
+
+    ipfs.pin.ls((err, pins) => {
+      expect(err).to.not.exist()
+      const initialPinCount = pins.length
+      ipfs.files.add(newContent, { pin: false }, (err, res) => {
+        expect(err).to.not.exist()
+
+        ipfs.pin.ls((err, pins) => {
+          expect(err).to.not.exist()
+          expect(pins.length).to.eql(initialPinCount)
+          done()
+        })
+      })
+    })
+  })
+
   HASH_ALGS.forEach((name) => {
     it(`files.add with hash=${name} and raw-leaves=false`, (done) => {
       const content = String(Math.random() + Date.now())

test/util.spec.js

@@ -101,7 +101,7 @@ describe('.util', () => {
       const filepath = path.join(os.tmpdir(), `${content}.txt`)
       fs.writeFileSync(filepath, content)
 
-      return ipfs.util.addFromFs(filepath, { 'only-hash': true })
+      return ipfs.util.addFromFs(filepath, { onlyHash: true })
         .then(out => {
           fs.unlinkSync(filepath)
           return expectTimeout(ipfs.object.get(out[0].hash), 4000)
@@ -120,15 +120,19 @@ describe('.util', () => {
       })
     })
 
-    it('https', (done) => {
+    it('https', function (done) {
+      this.timeout(20 * 1000)
+
       ipfs.util.addFromURL('https://example.com/', (err, result) => {
         expect(err).to.not.exist()
         expect(result.length).to.equal(1)
         done()
       })
     })
 
-    it('http with redirection', (done) => {
+    it('http with redirection', function (done) {
+      this.timeout(20 * 1000)
+
       ipfs.util.addFromURL('http://covers.openlibrary.org/book/id/969165.jpg', (err, result) => {
         expect(err).to.not.exist()
         expect(result[0].hash).to.equal('QmaL9zy7YUfvWmtD5ZXp42buP7P4xmZJWFkm78p8FJqgjg')