Clean up files tests.

Author: hackergrrl

test/files.js

@@ -9,23 +9,26 @@ const Readable = require('readable-stream')
 const path = require('path')
 const isNode = require('detect-node')
 
-let testfile
-let testfileBig
-const testfilePath = path.join(__dirname, './data/testfile.txt')
-
-if (isNode) {
-  const fs = require('fs')
-  testfile = fs.readFileSync(testfilePath)
-  testfileBig = fs.createReadStream(path.join(__dirname, './data/15mb.random'), { bufferSize: 128 })
-} else {
-  testfile = require('raw!./data/testfile.txt')
-}
-
 module.exports = (common) => {
   describe('.files/add', () => {
+    let testfile
+    let testfileBig
     let ipfs
 
     before((done) => {
+      // load test data
+      if (isNode) {
+        const fs = require('fs')
+
+        const testfilePath = path.join(__dirname, './data/testfile.txt')
+        testfile = fs.readFileSync(testfilePath)
+
+        const testfileBigPath = path.join(__dirname, './data/15mb.random')
+        testfileBig = fs.createReadStream(testfileBigPath, { bufferSize: 128 })
+      } else {
+        testfile = require('raw!./data/testfile.txt')
+      }
+
       common.setup((err, _ipfs) => {
         expect(err).to.not.exist
         ipfs = _ipfs
@@ -101,9 +104,10 @@ module.exports = (common) => {
         expect(err).to.not.exist
 
         expect(res).to.have.length(1)
-        const mh = bs58.encode(res[0].node.multihash()).toString()
-        expect(mh).to.equal('Qmcx5werSWQPdrGVap7LARHB4QUSPRPJwxhFuHvdoXqQXT')
         expect(res[0].node.links).to.have.length(58)
+        const mh = bs58.encode(res[0].node.multihash()).toString()
+        expect(res[0].path).to.equal(mh)
+        expect(mh).to.equal('Qme79tX2bViL26vNjPsF3DP1R9rMKMvnPYJiKTTKPrXJjq')
         done()
       })
     })
@@ -123,13 +127,9 @@ module.exports = (common) => {
         content('alice.txt'),
         content('files/hello.txt'),
         content('files/ipfs.txt'),
-        {
-          path: 'test-folder',
-          dir: true
-        }
       ]
 
-      ipfs.files.add(dirs, { recursive: true }, (err, res) => {
+      ipfs.files.add(dirs, (err, res) => {
         expect(err).to.not.exist
 
         const added = res[res.length - 1]