fix: reversion in browsers

Author: AuHau

migrations/migration-8/index.js

@@ -15,13 +15,13 @@ function encode (name) {
 }
 
 function decode (name) {
-  log(name)
   if (!name.startsWith(KEY_PREFIX)) {
     throw Error("Unknown format of key's name!")
   }
 
   const decoder = new base32.Decoder({ type: "rfc4648" })
-  return decoder.finalize(name.replace(KEY_PREFIX, '').toUpperCase())
+  const decodedNameBuff = decoder.finalize(name.replace(KEY_PREFIX, '').toUpperCase())
+  return Buffer.from(decodedNameBuff).toString()
 }
 
 async function processFolder (store, prefix, fileNameProcessor) {

test/browser.js

@@ -43,6 +43,10 @@ describe('Browser specific tests', () => {
     require('./version-test')(createRepo, repoCleanup)
   })
 
+  describe('migrations tests', () => {
+    require('./migrations/migration-8-test')(createRepo, repoCleanup)
+  })
+
   describe('init tests', () => {
     require('./init-test')(createRepo, repoCleanup)
   })

test/migrations/migration-8-test.js

@@ -3,7 +3,7 @@
 
 const chai = require('chai')
 chai.use(require('dirty-chai'))
-const chaiAsPromised = require("chai-as-promised")
+const chaiAsPromised = require('chai-as-promised')
 chai.use(chaiAsPromised)
 const expect = chai.expect
 
@@ -27,8 +27,8 @@ async function bootstrapKeys (dir, encoded) {
   let name
   for (let keyNames of fixtures) {
     name = encoded ? keyNames[1] : keyNames[0]
-    await store.put(new Key(`/pkcs8/${name}`), '')
-    await store.put(new Key(`/info/${name}`), '')
+    await store.put(new Key(`/pkcs8/${ name }`), '')
+    await store.put(new Key(`/info/${ name }`), '')
   }
 
   await store.close()
@@ -41,42 +41,44 @@ async function validateKeys (dir, shouldBeEncoded) {
   let name
   for (let keyNames of fixtures) {
     name = shouldBeEncoded ? keyNames[1] : keyNames[0]
-    expect(await store.has(new Key(`/pkcs8/${name}`))).to.be.true()
-    expect(await store.has(new Key(`/info/${name}`))).to.be.true()
+    expect(await store.has(new Key(`/pkcs8/${ name }`))).to.be.true(name)
+    expect(await store.has(new Key(`/info/${ name }`))).to.be.true(name)
   }
 
   await store.close()
 }
 
 module.exports = (setup, cleanup) => {
-  let dir
+  describe('migration 8', () => {
+    let dir
 
-  beforeEach(async () => {
-    dir = await setup()
-  })
-  afterEach(() => cleanup(dir))
+    beforeEach(async () => {
+      dir = await setup()
+    })
+    afterEach(() => cleanup(dir))
 
-  it('should migrate forward', async () => {
-    await bootstrapKeys(dir, false)
-    await migration.migrate(dir)
-    await validateKeys(dir, true)
-  })
+    it('should migrate forward', async () => {
+      await bootstrapKeys(dir, false)
+      await migration.migrate(dir)
+      await validateKeys(dir, true)
+    })
 
-  it('should migrate backward', async () => {
-    await bootstrapKeys(dir, true)
-    await migration.revert(dir)
-    await validateKeys(dir, false)
-  })
+    it('should migrate backward', async () => {
+      await bootstrapKeys(dir, true)
+      await migration.revert(dir)
+      await validateKeys(dir, false)
+    })
 
-  it('should fail to migrate backward with invalid key name', async () => {
-    const store = new Datastore(path.join(dir, 'keys'), { extension: '.data', createIfMissing: true })
-    await store.open()
+    it('should fail to migrate backward with invalid key name', async () => {
+      const store = new Datastore(path.join(dir, 'keys'), { extension: '.data', createIfMissing: true })
+      await store.open()
 
-    await store.put(new Key('/pkcs8/mfawc'), '')
-    await store.put(new Key('/info/mfawc'), '')
+      await store.put(new Key('/pkcs8/mfawc'), '')
+      await store.put(new Key('/info/mfawc'), '')
 
-    await store.close()
+      await store.close()
 
-    expect(migration.revert(dir)).to.eventually.rejectedWith('Unknown format of key\'s name!')
+      expect(migration.revert(dir)).to.eventually.rejectedWith('Unknown format of key\'s name!')
+    })
   })
 }

test/node.js

@@ -44,7 +44,7 @@ describe('Node specific tests', () => {
   })
 
   describe('migrations tests', () => {
-    require('./migrations/migration-8-test')(repoSetup, repoCleanup)
+    require('./migrations/migration-8-test')(createRepo, repoCleanup)
   })
 
   describe('init tests', () => {