chore: fix up outside mfs tests

Author: achingbrain

src/files-mfs/cp.js

@@ -77,7 +77,9 @@ module.exports = (createCommon, options) => {
     })
 
     it('should copy from outside of mfs', async () => {
-      const [hash] = ipfs.add(fixtures.smallFile.data)
+      const [{
+        hash
+      }] = await ipfs.add(fixtures.smallFile.data)
       const testFilePath = `/${hat()}`
       await ipfs.files.cp(`/ipfs/${hash}`, testFilePath)
       const testFileData = await ipfs.files.read(testFilePath)

src/files-mfs/ls.js

@@ -95,10 +95,12 @@ module.exports = (createCommon, options) => {
 
     it('should ls from outside of mfs', async () => {
       const testFileName = hat()
-      const res = await ipfs.add({ path: `/test/${testFileName}`, content: fixtures.smallFile.data })
-      const listing = await ipfs.files.ls('/ipfs/' + res[res.length - 1])
+      const [{
+        hash
+      }] = await ipfs.add({ path: `/test/${testFileName}`, content: fixtures.smallFile.data })
+      const listing = await ipfs.files.ls('/ipfs/' + hash)
       expect(listing).to.have.length(1)
-      expect(listing[0].name).to.equal(testFileName)
+      expect(listing[0].name).to.equal(hash)
     })
 
     it('should list an empty directory', async () => {

src/files-mfs/mv.js

@@ -3,7 +3,6 @@
 
 const series = require('async/series')
 const hat = require('hat')
-const { fixtures } = require('../files-regular/utils')
 const { getDescribe, getIt, expect } = require('../utils/mocha')
 
 module.exports = (createCommon, options) => {
@@ -77,13 +76,5 @@ module.exports = (createCommon, options) => {
         })
       })
     })
-
-    it('should move from outside of mfs', async () => {
-      const [hash] = ipfs.add(fixtures.smallFile.data)
-      const testFilePath = `/${hat()}`
-      await ipfs.files.mv(`/ipfs/${hash}`, testFilePath)
-      const testFileData = await ipfs.files.read(testFilePath)
-      expect(testFileData).to.eql(fixtures.smallFile.data)
-    })
   })
 }

src/files-mfs/read.js

@@ -61,7 +61,9 @@ module.exports = (createCommon, options) => {
     })
 
     it('should read from outside of mfs', async () => {
-      const [hash] = ipfs.add(fixtures.smallFile.data)
+      const [{
+        hash
+      }] = await ipfs.add(fixtures.smallFile.data)
       const testFileData = await ipfs.files.read(`/ipfs/${hash}`)
       expect(testFileData).to.eql(fixtures.smallFile.data)
     })

src/files-mfs/stat.js

@@ -132,21 +132,18 @@ module.exports = (createCommon, options) => {
       })
     })
 
-    it('should stat outside of mfs', function (done) {
-      ipfs.files.stat('/ipfs/' + fixtures.smallFile.cid, (err, stat) => {
-        expect(err).to.not.exist()
-        expect(stat).to.include({
-          type: 'file',
-          blocks: 0,
-          size: 12,
-          hash: fixtures.smallFile.cid,
-          cumulativeSize: 20,
-          withLocality: false
-        })
-        expect(stat.local).to.be.undefined()
-        expect(stat.sizeLocal).to.be.undefined()
-        done()
+    it('should stat outside of mfs', async () => {
+      const stat = await ipfs.files.stat('/ipfs/' + fixtures.smallFile.cid)
+      expect(stat).to.include({
+        type: 'file',
+        blocks: 0,
+        size: 12,
+        hash: fixtures.smallFile.cid,
+        cumulativeSize: 20,
+        withLocality: false
       })
+      expect(stat.local).to.be.undefined()
+      expect(stat.sizeLocal).to.be.undefined()
     })
   })
 }