fix .ls test

Author: daviddias

src/files.js

@@ -17,7 +17,7 @@ const through = require('through2')
 const Buffer = require('safe-buffer').Buffer
 
 module.exports = (common) => {
-  describe('.files', function () {
+  describe.only('.files', function () {
     this.timeout(80 * 1000)
 
     let smallFile
@@ -535,58 +535,6 @@ module.exports = (common) => {
           })
         })
       })
-
-      describe('.ls', () => {
-        it('with a base58 encoded string', () => {
-          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,
-                  name: 'alice.txt',
-                  path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/alice.txt',
-                  size: 11696,
-                  hash: 'QmZyUEQVuRK3XV7L9Dk26pg6RVSgaYkiSTEdnT2kZZdwoi',
-                  type: 'file' },
-                { depth: 1,
-                  name: 'empty-folder',
-                  path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/empty-folder',
-                  size: 4,
-                  hash: 'QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn',
-                  type: 'dir' },
-                { depth: 1,
-                  name: 'files',
-                  path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/files',
-                  size: 183,
-                  hash: 'QmZ25UfTqXGz9RsEJFg7HUAuBcmfx5dQZDXQd2QEZ8Kj74',
-                  type: 'dir' },
-                { depth: 1,
-                  name: 'holmes.txt',
-                  path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/holmes.txt',
-                  size: 582072,
-                  hash: 'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr',
-                  type: 'file' },
-                { depth: 1,
-                  name: 'jungle.txt',
-                  path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/jungle.txt',
-                  size: 2305,
-                  hash: 'QmT6orWioMiSqXXPGsUi71CKRRUmJ8YkuueV2DPV34E9y9',
-                  type: 'file' },
-                { depth: 1,
-                  name: 'pp.txt',
-                  path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
-                  size: 4551,
-                  hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
-                  type: 'file' } ])
-                resolve()
-              }))
-            })
-          })
-        })
-      })
     })
 
     describe('promise API', () => {
@@ -684,15 +632,20 @@ module.exports = (common) => {
       })
 
       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,
@@ -727,10 +680,10 @@ module.exports = (common) => {
                   path: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP/pp.txt',
                   size: 4551,
                   hash: 'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn',
-                  type: 'file' } ])
-                resolve()
-              }))
-            })
+                  type: 'file'
+                }
+              ])
+            }
           })
         })
       })