wip

Author: dignifiedquire

.travis.yml

@@ -6,11 +6,11 @@ matrix:
   - node_js: 4
     env: CXX=g++-4.8
   - node_js: 6
-    env: CXX=g++-4.8
-  - node_js: stable
     env:
-    - SAUCE=true
-    - CXX=g++-4.8
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:

test/data/15mb.random renamed to test/fixtures/15mb.random

@@ -4,18 +4,12 @@
 
 const expect = require('chai').expect
 const isNode = require('detect-node')
-const path = require('path')
 const test = require('interface-ipfs-core')
-const fs = require('fs')
-const FactoryClient = require('../factory/factory-client')
+const loadFixture = require('aegir/fixtures')
 
-let testfile
+const FactoryClient = require('../factory/factory-client')
 
-if (isNode) {
-  testfile = fs.readFileSync(path.join(__dirname, '/../data/testfile.txt'))
-} else {
-  testfile = require('file!../data/testfile.txt')
-}
+const testfile = loadFixture(__dirname, '../fixtures/testfile.txt')
 
 // add, cat, get and ls tests from interface-ipfs-core
 let fc

test/data/r-config.json renamed to test/fixtures/r-config.json

@@ -10,20 +10,15 @@ const concat = require('concat-stream')
 const through = require('through2')
 const streamEqual = require('stream-equal')
 const path = require('path')
+const loadFixture = require('aegir/fixtures')
 const FactoryClient = require('../factory/factory-client')
 
-let testfile
-
-if (isNode) {
-  testfile = fs.readFileSync(path.join(__dirname, '/../data/testfile.txt'))
-} else {
-  testfile = require('file!../data/testfile.txt')
-}
+const testfile = loadFixture(__dirname, '../fixtures/testfile.txt')
 
 let testfileBig
 let tfbPath
 if (isNode) {
-  tfbPath = path.join(__dirname, '/../data/15mb.random')
+  tfbPath = path.join(__dirname, '/../fixtures/15mb.random')
   testfileBig = fs.createReadStream(tfbPath, { bufferSize: 128 })
 }
 

test/data/test-folder/add.js renamed to test/fixtures/test-folder/add.js

@@ -24,7 +24,7 @@ describe('ls', function () {
       (cb) => fc.spawnNode(cb),
       (node, cb) => {
         ipfs = node
-        const filesPath = path.join(__dirname, '../data/test-folder')
+        const filesPath = path.join(__dirname, '../fixtures/test-folder')
         ipfs.util.addFromFs(filesPath, { recursive: true }, cb)
       },
       (hashes, cb) => {

test/data/test-folder/cat.js renamed to test/fixtures/test-folder/cat.js

@@ -3,17 +3,9 @@
 'use strict'
 
 const expect = require('chai').expect
-const fs = require('fs')
-const path = require('path')
-const isNode = require('detect-node')
+const loadFixture = require('aegir/fixtures')
 
-let testfile
-
-if (isNode) {
-  testfile = fs.readFileSync(path.join(__dirname, '/../data/testfile.txt'))
-} else {
-  testfile = require('file!../data/testfile.txt')
-}
+const testfile = loadFixture(__dirname, '../fixtures/testfile.txt')
 
 describe('.name', () => {
   let name

test/data/test-folder/files/hello.txt renamed to test/fixtures/test-folder/files/hello.txt

@@ -23,7 +23,7 @@ describe('.refs', () => {
       (cb) => fc.spawnNode(cb),
       (node, cb) => {
         ipfs = node
-        const filesPath = path.join(__dirname, '../data/test-folder')
+        const filesPath = path.join(__dirname, '../fixtures/test-folder')
         ipfs.util.addFromFs(filesPath, { recursive: true }, cb)
       },
       (hashes, cb) => {

test/data/test-folder/files/ipfs.txt renamed to test/fixtures/test-folder/files/ipfs.txt

@@ -57,7 +57,7 @@ describe('ipfsAPI request tests', () => {
         res.end()
       }).listen(6001, () => {
         ipfsAPI('/ip4/127.0.0.1/tcp/6001')
-          .config.replace('test/data/r-config.json', (err) => {
+          .config.replace('test/fixtures/r-config.json', (err) => {
             expect(err).to.not.exist
             server.close(done)
           })

test/data/test-folder/hello-link renamed to test/fixtures/test-folder/hello-link

@@ -31,7 +31,7 @@ describe('.util', () => {
   })
 
   it('.streamAdd', (done) => {
-    const tfpath = path.join(__dirname, '/../data/testfile.txt')
+    const tfpath = path.join(__dirname, '/../fixtures/testfile.txt')
     const rs = fs.createReadStream(tfpath)
     rs.path = '' // clean the path for testing purposes
 
@@ -43,7 +43,7 @@ describe('.util', () => {
   })
 
   it('.fsAdd a directory', (done) => {
-    const filesPath = path.join(__dirname, '../data/test-folder')
+    const filesPath = path.join(__dirname, '../fixtures/test-folder')
     ipfs.util.addFromFs(filesPath, { recursive: true }, (err, result) => {
       expect(err).to.not.exist
       expect(result.length).to.be.above(8)
@@ -52,7 +52,7 @@ describe('.util', () => {
   })
 
   it('.fsAdd a file', (done) => {
-    const filePath = path.join(__dirname, '../data/testfile.txt')
+    const filePath = path.join(__dirname, '../fixtures/testfile.txt')
     ipfs.util.addFromFs(filePath, (err, result) => {
       expect(err).to.not.exist
       expect(result.length).to.be.above(5)