chore: use files fixtures in ls tests

License: MIT
Signed-off-by: Alan Shaw <alan@tableflip.io>

Author: alanshaw

js/src/ls/ls-pull-stream.js

@@ -7,7 +7,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const loadFixture = require('aegir/fixtures')
+const { fixtures } = require('../files/utils')
 const pull = require('pull-stream')
 const { getDescribe, getIt } = require('../utils/mocha')
 
@@ -21,18 +21,6 @@ module.exports = (createCommon, options) => {
 
     let ipfs
 
-    const directory = {
-      cid: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP',
-      files: {
-        'pp.txt': loadFixture('js/test/fixtures/test-folder/pp.txt', 'interface-ipfs-core'),
-        'holmes.txt': loadFixture('js/test/fixtures/test-folder/holmes.txt', 'interface-ipfs-core'),
-        'jungle.txt': loadFixture('js/test/fixtures/test-folder/jungle.txt', 'interface-ipfs-core'),
-        'alice.txt': loadFixture('js/test/fixtures/test-folder/alice.txt', 'interface-ipfs-core'),
-        'files/hello.txt': loadFixture('js/test/fixtures/test-folder/files/hello.txt', 'interface-ipfs-core'),
-        'files/ipfs.txt': loadFixture('js/test/fixtures/test-folder/files/ipfs.txt', 'interface-ipfs-core')
-      }
-    }
-
     before(function (done) {
       // CI takes longer to instantiate the daemon, so we need to increase the
       // timeout for the before step
@@ -53,7 +41,7 @@ module.exports = (createCommon, options) => {
     it('should pull stream ls with a base58 encoded CID', function (done) {
       const content = (name) => ({
         path: `test-folder/${name}`,
-        content: directory.files[name]
+        content: fixtures.directory.files[name]
       })
 
       const emptyDir = (name) => ({ path: `test-folder/${name}` })
@@ -74,7 +62,7 @@ module.exports = (createCommon, options) => {
         const root = res[res.length - 1]
 
         expect(root.path).to.equal('test-folder')
-        expect(root.hash).to.equal(directory.cid)
+        expect(root.hash).to.equal(fixtures.directory.cid)
 
         const cid = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
         const stream = ipfs.lsPullStream(cid)

js/src/ls/ls-readable-stream.js

@@ -7,7 +7,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const loadFixture = require('aegir/fixtures')
+const { fixtures } = require('../files/utils')
 const concat = require('concat-stream')
 const { getDescribe, getIt } = require('../utils/mocha')
 
@@ -21,22 +21,6 @@ module.exports = (createCommon, options) => {
 
     let ipfs
 
-    function fixture (path) {
-      return loadFixture(path, 'interface-ipfs-core')
-    }
-
-    const directory = {
-      cid: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP',
-      files: {
-        'pp.txt': fixture('js/test/fixtures/test-folder/pp.txt'),
-        'holmes.txt': fixture('js/test/fixtures/test-folder/holmes.txt'),
-        'jungle.txt': fixture('js/test/fixtures/test-folder/jungle.txt'),
-        'alice.txt': fixture('js/test/fixtures/test-folder/alice.txt'),
-        'files/hello.txt': fixture('js/test/fixtures/test-folder/files/hello.txt'),
-        'files/ipfs.txt': fixture('js/test/fixtures/test-folder/files/ipfs.txt')
-      }
-    }
-
     before(function (done) {
       // CI takes longer to instantiate the daemon, so we need to increase the
       // timeout for the before step
@@ -57,7 +41,7 @@ module.exports = (createCommon, options) => {
     it('should readable stream ls with a base58 encoded CID', function (done) {
       const content = (name) => ({
         path: `test-folder/${name}`,
-        content: directory.files[name]
+        content: fixtures.directory.files[name]
       })
 
       const emptyDir = (name) => ({ path: `test-folder/${name}` })
@@ -78,7 +62,7 @@ module.exports = (createCommon, options) => {
         const root = res[res.length - 1]
 
         expect(root.path).to.equal('test-folder')
-        expect(root.hash).to.equal(directory.cid)
+        expect(root.hash).to.equal(fixtures.directory.cid)
 
         const cid = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
         const stream = ipfs.lsReadableStream(cid)

js/src/ls/ls.js

@@ -7,7 +7,7 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const loadFixture = require('aegir/fixtures')
+const { fixtures } = require('../files/utils')
 const { getDescribe, getIt } = require('../utils/mocha')
 
 module.exports = (createCommon, options) => {
@@ -20,18 +20,6 @@ module.exports = (createCommon, options) => {
 
     let ipfs
 
-    const directory = {
-      cid: 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP',
-      files: {
-        'pp.txt': loadFixture('js/test/fixtures/test-folder/pp.txt', 'interface-ipfs-core'),
-        'holmes.txt': loadFixture('js/test/fixtures/test-folder/holmes.txt', 'interface-ipfs-core'),
-        'jungle.txt': loadFixture('js/test/fixtures/test-folder/jungle.txt', 'interface-ipfs-core'),
-        'alice.txt': loadFixture('js/test/fixtures/test-folder/alice.txt', 'interface-ipfs-core'),
-        'files/hello.txt': loadFixture('js/test/fixtures/test-folder/files/hello.txt', 'interface-ipfs-core'),
-        'files/ipfs.txt': loadFixture('js/test/fixtures/test-folder/files/ipfs.txt', 'interface-ipfs-core')
-      }
-    }
-
     before(function (done) {
       // CI takes longer to instantiate the daemon, so we need to increase the
       // timeout for the before step
@@ -52,7 +40,7 @@ module.exports = (createCommon, options) => {
     it('should ls with a base58 encoded CID', function (done) {
       const content = (name) => ({
         path: `test-folder/${name}`,
-        content: directory.files[name]
+        content: fixtures.directory.files[name]
       })
 
       const emptyDir = (name) => ({ path: `test-folder/${name}` })
@@ -73,7 +61,7 @@ module.exports = (createCommon, options) => {
         const root = res[res.length - 1]
 
         expect(root.path).to.equal('test-folder')
-        expect(root.hash).to.equal(directory.cid)
+        expect(root.hash).to.equal(fixtures.directory.cid)
 
         const cid = 'QmVvjDy7yF7hdnqE8Hrf4MHo5ABDtb5AbX6hWbD3Y42bXP'
         ipfs.ls(cid, (err, files) => {