Merge branch 'master' into revamp-stream-apis

Author: daviddias

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="0.34.2"></a>
+## [0.34.2](https://github.com/ipfs/interface-ipfs-core/compare/v0.34.0...v0.34.2) (2017-11-13)
+
+
+
+<a name="0.34.1"></a>
+## [0.34.1](https://github.com/ipfs/interface-ipfs-core/compare/v0.34.0...v0.34.1) (2017-11-13)
+
+
+
 <a name="0.34.0"></a>
 # [0.34.0](https://github.com/ipfs/interface-ipfs-core/compare/v0.33.2...v0.34.0) (2017-11-13)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "interface-ipfs-core",
-  "version": "0.34.0",
+  "version": "0.34.2",
   "description": "A test suite and interface you can use to implement a IPFS core interface.",
   "main": "src/index.js",
   "scripts": {

src/files.js

@@ -663,15 +663,20 @@ module.exports = (common) => {
 
     // TODO upgrade
     describe('.ls', () => {
-      it('with a base58 encoded string', () => {
+      it('with a base58 encoded string', (done) => {
         const hash = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
-        return ipfs.files.ls(hash).then((stream) => {
-          return new Promise((resolve, reject) => {
-            stream.pipe(concat((files) => {
-              expect(files).to.be.length(6)
-              // remove content so that we can compare
-              files.forEach((file) => delete file.content)
-              expect(files).to.deep.equal([ { depth: 1,
+        ipfs.ls(hash, (err, stream) => {
+          expect(err).to.not.exist()
+
+          stream.pipe(concat(gotFiles))
+
+          function gotFiles (files) {
+            expect(files).to.be.length(6)
+            // remove content so that we can compare
+            files.forEach((file) => delete file.content)
+
+            expect(files).to.eql([
+              { depth: 1,
                 name: 'alice.txt',
                 path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
                 size: 11696,
@@ -706,9 +711,10 @@ module.exports = (common) => {
                 path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
                 size: 4551,
                 hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
-                type: 'file' } ])
-              resolve()
-            }))
+                type: 'file'
+              }
+            ])
+           }
           })
         })
       })