From 671bfa44e94e90127cf82953950684fb12b2e805 Mon Sep 17 00:00:00 2001
From: Andre Staltz <andre@staltz.com>
Date: Thu, 7 Jan 2021 17:25:13 +0200
Subject: [PATCH 1/2] allow passing path as input opt

---
 README.md     | 11 ++++++-----
 index.js      | 11 +++++------
 test/index.js | 20 ++++++++++++++++++++
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 81cdf42..c8d7deb 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,18 @@ piet.publish({type: 'test', content: "a test message"}, (err, msg) => {
 
 Outputs:
 ```
-{ 
+{
   key: '%FQ2auS8kVY9qPgpTWNY3le/JG5+IlO6JHDjBIQcSPSc=.sha256',
-  value: { 
+  value: {
     previous: null,
     sequence: 1,
     author: '@UreG2i/rf4mz7QAVOtg0OML5SRRB42Cwwl3D1ct0mbU=.ed25519',
     timestamp: 1517190039755,
     hash: 'sha256',
     content: { type: 'test', content: 'a test message' },
-    signature: '0AxMJ7cKjHQ6vJDPkVNWcGND4gUwv2Z8barND5eha7ZXH/s5T0trFqcratIqzmhE3YJU2FY61Rf1S/Za2foLCA==.sig.ed25519' 
+    signature: '0AxMJ7cKjHQ6vJDPkVNWcGND4gUwv2Z8barND5eha7ZXH/s5T0trFqcratIqzmhE3YJU2FY61Rf1S/Za2foLCA==.sig.ed25519'
   },
-  timestamp: 1517190039758 
+  timestamp: 1517190039758
 }
 ```
 
@@ -47,7 +47,8 @@ By default, CreateTestSbot deletes an existing database of the same `name` befor
 
 Valid `opts` keys include:
 - `name` *String* (optional) (default: `ssb-test + Number(new Date)`)
-    - `myTestName`: Sets the database in /tmp/myTestName 
+- `path` *String* (optional) (default: `/tmp/${name}`, where `name` is the above)
+    - `~/.ssb-test`: Sets the database in `~/.ssb-test`
 - `keys` *String* (optional) (default: scuttle-testbot generates a new set of random keys)
     - you can create your own keys with `ssbKeys.generate()`
 - `startUnclean` (default: `false`)
diff --git a/index.js b/index.js
index 52b0cab..e1ecee4 100644
--- a/index.js
+++ b/index.js
@@ -13,8 +13,10 @@ function createTestBot (opts = {}) {
   if (!opts.name) {
     opts.name = `ssb-test-${Date.now()}-${Math.floor(Math.random() * 1000)}`
   }
-  const folderPath = join('/tmp', opts.name)
-  if (!opts.startUnclean) { rimraf.sync(folderPath) }
+  if (!opts.path) {
+    opts.path = join(os.tmpdir(), opts.name)
+  }
+  if (!opts.startUnclean) { rimraf.sync(opts.path) }
   if (!opts.keys) { opts.keys = ssbKeys.generate() }
 
   const caps = {
@@ -28,10 +30,7 @@ function createTestBot (opts = {}) {
   plugins.forEach(plugin => createSbot.use(plugin))
   plugins = []
 
-  return createSbot({
-    ...opts,
-    path: join(os.tmpdir(), opts.name)
-  })
+  return createSbot(opts)
 }
 
 createTestBot.use = function use (plugin) {
diff --git a/test/index.js b/test/index.js
index 314ea96..a16bb45 100644
--- a/test/index.js
+++ b/test/index.js
@@ -59,3 +59,23 @@ test('persist database across instances', (t) => {
     })
   })
 })
+
+test('allows two peers to share the same folder', (t) => {
+  const a = CreateTestSbot({ name: 'scuttle-testbot-shared' })
+
+  a.publish({ type: 'test' }, (err, val) => {
+    t.error(err, 'no error on publish')
+    a.close((err) => {
+      t.error(err, 'no error on close')
+      const b = CreateTestSbot({
+        path: '/tmp/scuttle-testbot-shared',
+        startUnclean: true,
+      })
+      b.get(val.key, (err, val) => {
+        t.error(err, 'no error on get')
+        t.ok(val, 'got message')
+        b.close(t.end)
+      })
+    })
+  })
+})

From 88a6e1c41a9992b2044c9bdd6c266e4cf0707c15 Mon Sep 17 00:00:00 2001
From: Andre Staltz <andre@staltz.com>
Date: Thu, 7 Jan 2021 19:36:39 +0200
Subject: [PATCH 2/2] simplify test for path opt

---
 test/index.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/index.js b/test/index.js
index a16bb45..73bf4ca 100644
--- a/test/index.js
+++ b/test/index.js
@@ -1,4 +1,5 @@
 var test = require('tape')
+var fs = require('fs')
 var CreateTestSbot = require('../')
 
 test('creates an sbot', function (t) {
@@ -60,22 +61,15 @@ test('persist database across instances', (t) => {
   })
 })
 
-test('allows two peers to share the same folder', (t) => {
-  const a = CreateTestSbot({ name: 'scuttle-testbot-shared' })
+test('allows specifying the path to the db', (t) => {
+  const a = CreateTestSbot({ path: '/tmp/overhere/scuttle-testbot' })
 
   a.publish({ type: 'test' }, (err, val) => {
     t.error(err, 'no error on publish')
     a.close((err) => {
       t.error(err, 'no error on close')
-      const b = CreateTestSbot({
-        path: '/tmp/scuttle-testbot-shared',
-        startUnclean: true,
-      })
-      b.get(val.key, (err, val) => {
-        t.error(err, 'no error on get')
-        t.ok(val, 'got message')
-        b.close(t.end)
-      })
+      t.true(fs.existsSync('/tmp/overhere/scuttle-testbot/conn.json'))
+      t.end()
     })
   })
 })