From ff8b5a425a27cc700aa5179f8a5e4ab75ce1df45 Mon Sep 17 00:00:00 2001 From: haad Date: Wed, 6 Dec 2017 08:30:44 +0100 Subject: [PATCH] Remove obsolete test-utils --- test/create-open.test.js | 1 - test/eventlog.test.js | 6 +++--- test/feed.test.js | 12 ++++++------ test/utils/test-utils.js | 18 ------------------ 4 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 test/utils/test-utils.js diff --git a/test/create-open.test.js b/test/create-open.test.js index 88b2c81..92e2663 100644 --- a/test/create-open.test.js +++ b/test/create-open.test.js @@ -7,7 +7,6 @@ const rmrf = require('rimraf') const mapSeries = require('p-map-series') const OrbitDB = require('../src/OrbitDB') const OrbitDBAddress = require('../src/orbit-db-address') -const { first, last } = require('./utils/test-utils') const config = require('./utils/config') const startIpfs = require('./utils/start-ipfs') diff --git a/test/eventlog.test.js b/test/eventlog.test.js index c50b227..f9b5a19 100644 --- a/test/eventlog.test.js +++ b/test/eventlog.test.js @@ -4,11 +4,11 @@ const assert = require('assert') const rmrf = require('rimraf') const mapSeries = require('p-map-series') const OrbitDB = require('../src/OrbitDB') -const first = require('./utils/test-utils').first -const last = require('./utils/test-utils').last const config = require('./utils/config') const startIpfs = require('./utils/start-ipfs') +const last = arr => arr[arr.length - 1] + const dbPath = './orbitdb/tests/eventlog' const ipfsPath = './orbitdb/tests/eventlog/ipfs' @@ -65,7 +65,7 @@ describe('orbit-db - Eventlog', function() { await mapSeries([1, 2, 3, 4, 5], (i) => db.add('hello' + i)) const items = db.iterator({ limit: -1 }).collect() assert.equal(items.length, 5) - assert.equal(first(items.map((f) => f.payload.value)), 'hello1') + assert.equal(items[0].payload.value, 'hello1') assert.equal(last(items.map((f) => f.payload.value)), 'hello5') }) diff --git a/test/feed.test.js b/test/feed.test.js index c5d730f..59b0d8e 100644 --- a/test/feed.test.js +++ b/test/feed.test.js @@ -4,11 +4,11 @@ const assert = require('assert') const rmrf = require('rimraf') const mapSeries = require('p-map-series') const OrbitDB = require('../src/OrbitDB') -const first = require('./utils/test-utils').first -const last = require('./utils/test-utils').last const config = require('./utils/config') const startIpfs = require('./utils/start-ipfs') +const last = arr => arr[arr.length - 1] + const dbPath = './orbitdb/tests/feed' const ipfsPath = './orbitdb/tests/feed/ipfs' @@ -68,8 +68,8 @@ describe('orbit-db - Feed', function() { await mapSeries([1, 2, 3, 4, 5], (i) => db.add('hello' + i)) const items = db.iterator({ limit: -1 }).collect() assert.equal(items.length, 5) - assert.equal(first(items.map((f) => f.payload.value)), 'hello1') - assert.equal(last(items.map((f) => f.payload.value)), 'hello5') + assert.equal(items[0].payload.value, 'hello1') + assert.equal(items[items.length - 1].payload.value, 'hello5') }) it('adds an item that is > 256 bytes', async () => { @@ -99,7 +99,7 @@ describe('orbit-db - Feed', function() { await db.remove(hash) const items = db.iterator({ limit: -1 }).collect() assert.equal(items.length, 1) - assert.equal(first(items).payload.value, 'hello1') + assert.equal(items[0].payload.value, 'hello1') }) it('deletes an item between adds', async () => { @@ -113,7 +113,7 @@ describe('orbit-db - Feed', function() { const items = db.iterator({ limit: -1 }).collect() assert.equal(items.length, 2) - const firstItem = first(items) + const firstItem = items[0] const secondItem = items[1] assert.equal(firstItem.hash.startsWith('Qm'), true) assert.equal(firstItem.payload.key, null) diff --git a/test/utils/test-utils.js b/test/utils/test-utils.js deleted file mode 100644 index 187d461..0000000 --- a/test/utils/test-utils.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict' - -// Helper functions - -exports.hasIpfsApiWithPubsub = (ipfs) => { - return ipfs.object.get !== undefined - && ipfs.object.put !== undefined - && ipfs.pubsub.publish !== undefined - && ipfs.pubsub.subscribe !== undefined -} - -exports.first = (arr) => { - return arr[0] -} - -exports.last = (arr) => { - return arr[arr.length - 1] -}