Merge pull request #93 from orbitdb/release-3.3.0

release 3.3.0: updating ipfs-log and tests
orbitdb-archive · May 11, 2020 · 6f0214b · 6f0214b
2 parents 649ee15 + 441b264
commit 6f0214b
Show file tree

Hide file tree

Showing 7 changed files with 8,177 additions and 27,591 deletions.
diff --git a/conf/webpack.tests.config.js b/conf/webpack.tests.config.js
@@ -25,7 +25,7 @@ module.exports = {
     new webpack.IgnorePlugin(/mongo|redis/)
   ],
   externals: {
-    fs: '{}',
+    fs: '{ existsSync: () => true }',
     fatfs: '{}',
     runtimejs: '{}',
     rimraf: '{ sync: () => {} }',

diff --git a/dist/orbit-db-store.min.js b/dist/orbit-db-store.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orbit-db-store",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Base class for orbit-db data stores",
   "main": "src/Store.js",
   "scripts": {
@@ -22,7 +22,7 @@
   "author": "Haad",
   "license": "MIT",
   "dependencies": {
-    "ipfs-log": "~4.5.0",
+    "ipfs-log": "~4.6.0",
     "it-to-stream": "^0.1.1",
     "logplease": "^1.2.14",
     "orbit-db-io": "~0.2.0",
@@ -51,7 +51,7 @@
     "orbit-db-identity-provider": "~0.3.0",
     "orbit-db-keystore": "~0.3.0",
     "orbit-db-storage-adapter": "^0.4.2",
-    "orbit-db-test-utils": "^0.8.5",
+    "orbit-db-test-utils": "^0.9.2",
     "rimraf": "^3.0.0",
     "standard": "^14.0.2",
     "webpack": "^4.39.2",

diff --git a/test/add.spec.js b/test/add.spec.js
@@ -22,7 +22,7 @@ const storage = require('orbit-db-storage-adapter')(properLevelModule)
 
 Object.keys(testAPIs).forEach((IPFS) => {
   describe(`addOperation ${IPFS}`, function () {
-    let ipfs, testIdentity, identityStore, store, cacheStore
+    let ipfsd, ipfs, testIdentity, identityStore, store, cacheStore
 
     this.timeout(config.timeout)
 
@@ -38,7 +38,8 @@ Object.keys(testAPIs).forEach((IPFS) => {
       const cache = new Cache(cacheStore)
 
       testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore })
-      ipfs = await startIpfs(IPFS, ipfsConfig)
+      ipfsd = await startIpfs(IPFS, ipfsConfig)
+      ipfs = ipfsd.api
 
       const address = 'test-address'
       const options = Object.assign({}, DefaultOptions, { cache })
@@ -47,7 +48,7 @@ Object.keys(testAPIs).forEach((IPFS) => {
 
     after(async () => {
       await store.close()
-      await stopIpfs(ipfs)
+      await stopIpfs(ipfsd)
       await identityStore.close()
       await cacheStore.close()
     })

diff --git a/test/browser/index.html b/test/browser/index.html
@@ -9,12 +9,12 @@
 <div id="mocha"></div>
 
 <script>
-    mocha.setup("bdd");
+  mocha.setup({ ui: "bdd", globals: ['sprintf', 'vsprintf'] });
 </script>
 <script src="./bundle.js"></script>
 <script>
-    mocha.checkLeaks()
-    mocha.run();
+  mocha.checkLeaks()
+  mocha.run();
 </script>
 
 </body>

diff --git a/test/snapshot.spec.js b/test/snapshot.spec.js
@@ -22,7 +22,7 @@ const storage = require('orbit-db-storage-adapter')(properLevelModule)
 
 Object.keys(testAPIs).forEach((IPFS) => {
   describe(`Snapshots ${IPFS}`, function () {
-    let ipfs, testIdentity, identityStore, store, cacheStore
+    let ipfsd, ipfs, testIdentity, identityStore, store, cacheStore
 
     this.timeout(config.timeout)
 
@@ -38,7 +38,8 @@ Object.keys(testAPIs).forEach((IPFS) => {
       const cache = new Cache(cacheStore)
 
       testIdentity = await IdentityProvider.createIdentity({ id: 'userA', keystore })
-      ipfs = await startIpfs(IPFS, ipfsConfig)
+      ipfsd = await startIpfs(IPFS, ipfsConfig)
+      ipfs = ipfsd.api
 
       const address = 'test-address'
       const options = Object.assign({}, DefaultOptions, { cache })
@@ -47,7 +48,7 @@ Object.keys(testAPIs).forEach((IPFS) => {
 
     after(async () => {
       await store.close()
-      await stopIpfs(ipfs)
+      await stopIpfs(ipfsd)
       await identityStore.close()
       await cacheStore.close()
     })