tests: fix memory leaks (#2389)

packages/snjs/mocha/vaults/asymmetric-messages.test.js

@@ -9,11 +9,6 @@ describe('asymmetric messages', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('asymmetric messages', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should not trust message if the trusted payload data recipientUuid does not match the message user uuid', async () => {
     const { sharedVault, contactContext, deinitContactContext } =
       await Collaboration.createSharedVaultWithAcceptedInvite(context)

packages/snjs/mocha/vaults/conflicts.test.js

@@ -9,11 +9,6 @@ describe('shared vault conflicts', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('shared vault conflicts', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('after being removed from shared vault, attempting to sync previous vault item should result in SharedVaultNotMemberError. The item should be duplicated then removed.', async () => {
     const { sharedVault, note, contactContext, deinitContactContext } =
       await Collaboration.createSharedVaultWithAcceptedInviteAndNote(context)
@@ -81,7 +82,10 @@ describe('shared vault conflicts', function () {
 
   it('attempting to modify note as read user should result in SharedVaultInsufficientPermissionsError', async () => {
     const { note, contactContext, deinitContactContext } =
-      await Collaboration.createSharedVaultWithAcceptedInviteAndNote(context, SharedVaultUserPermission.PERMISSIONS.Read)
+      await Collaboration.createSharedVaultWithAcceptedInviteAndNote(
+        context,
+        SharedVaultUserPermission.PERMISSIONS.Read,
+      )
 
     const promise = contactContext.resolveWithConflicts()
     await contactContext.changeNoteTitleAndSync(note, 'new title')

packages/snjs/mocha/vaults/contacts.test.js

@@ -9,11 +9,6 @@ describe('contacts', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('contacts', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should create contact', async () => {
     const contact = await context.contacts.createOrEditTrustedContact({
       name: 'John Doe',

packages/snjs/mocha/vaults/crypto.test.js

@@ -9,11 +9,6 @@ describe('shared vault crypto', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('shared vault crypto', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   describe('root key', () => {
     it('root key loaded from disk should have keypairs', async () => {
       const appIdentifier = context.identifier

packages/snjs/mocha/vaults/deletion.test.js

@@ -10,11 +10,6 @@ describe('shared vault deletion', function () {
   let context
   let sharedVaults
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -26,6 +21,12 @@ describe('shared vault deletion', function () {
     sharedVaults = context.sharedVaults
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should remove item from all user devices when item is deleted permanently', async () => {
     const { note, contactContext, deinitContactContext } =
       await Collaboration.createSharedVaultWithAcceptedInviteAndNote(context)
@@ -102,7 +103,10 @@ describe('shared vault deletion', function () {
 
   it('leaving a shared vault should remove its items locally', async () => {
     const { sharedVault, note, contactContext, deinitContactContext } =
-      await Collaboration.createSharedVaultWithAcceptedInviteAndNote(context, SharedVaultUserPermission.PERMISSIONS.Admin)
+      await Collaboration.createSharedVaultWithAcceptedInviteAndNote(
+        context,
+        SharedVaultUserPermission.PERMISSIONS.Admin,
+      )
 
     const originalNote = contactContext.items.findItem(note.uuid)
     expect(originalNote).to.not.be.undefined

packages/snjs/mocha/vaults/files.test.js

@@ -11,11 +11,6 @@ describe('shared vault files', function () {
   let context
   let vaults
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -28,6 +23,12 @@ describe('shared vault files', function () {
     await context.activatePaidSubscriptionForUser()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   describe('private vaults', () => {
     it('should be able to upload and download file to private vault as owner', async () => {
       const vault = await Collaboration.createPrivateVault(context)

packages/snjs/mocha/vaults/importing.test.js

@@ -9,11 +9,6 @@ describe.skip('vault importing', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe.skip('vault importing', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should import vaulted items with synced root key', async () => {
     console.error('TODO: implement')
   })

packages/snjs/mocha/vaults/invites.test.js

@@ -9,11 +9,6 @@ describe('shared vault invites', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -22,6 +17,12 @@ describe('shared vault invites', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should invite contact to vault', async () => {
     const sharedVault = await Collaboration.createSharedVault(context)
     const { contactContext, deinitContactContext } = await Collaboration.createContactContext()

packages/snjs/mocha/vaults/items.test.js

@@ -9,11 +9,6 @@ describe('shared vault items', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('shared vault items', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should add item to shared vault with no other members', async () => {
     const note = await context.createSyncedNote('foo', 'bar')
 

packages/snjs/mocha/vaults/key-management.test.js

@@ -8,11 +8,6 @@ describe('vault key management', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -21,6 +16,12 @@ describe('vault key management', function () {
     await context.launch()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   describe('locking', () => {
     it('should throw if attempting to add item to locked vault', async () => {
       const vault = await context.vaults.createUserInputtedPasswordVault({

packages/snjs/mocha/vaults/key-rotation.test.js

@@ -9,11 +9,6 @@ describe('vault key rotation', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('vault key rotation', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('should reencrypt all items keys belonging to key system', async () => {
     const { sharedVault, contactContext, deinitContactContext } =
       await Collaboration.createSharedVaultWithAcceptedInvite(context)

packages/snjs/mocha/vaults/key-sharing.test.js

@@ -9,11 +9,6 @@ describe('vault key sharing', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('vault key sharing', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('sharing a vault with user inputted and ephemeral password should share the key as synced for the recipient', async () => {
     const privateVault = await context.vaults.createUserInputtedPasswordVault({
       name: 'My Private Vault',

packages/snjs/mocha/vaults/keypair-change.test.js

@@ -9,11 +9,6 @@ describe('keypair change', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('keypair change', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('contacts should be able to handle receiving multiple keypair changed messages and trust them in order', async () => {
     const { note, contactContext, deinitContactContext } =
       await Collaboration.createSharedVaultWithAcceptedInviteAndNote(context)

packages/snjs/mocha/vaults/permissions.test.js

@@ -9,11 +9,6 @@ describe('shared vault permissions', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,12 @@ describe('shared vault permissions', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+  })
+
   it('non-admin user should not be able to invite user', async () => {
     context.anticipateConsoleError('Could not create invite')
 
@@ -42,6 +43,8 @@ describe('shared vault permissions', function () {
 
     expect(result.isFailed()).to.be.true
 
+    await thirdParty.deinitContactContext()
+
     await deinitContactContext()
   })
 

packages/snjs/mocha/vaults/pkc.test.js

@@ -7,24 +7,23 @@ describe('public key cryptography', function () {
   this.timeout(Factory.TwentySecondTimeout)
 
   let context
-  let sessions
-  let encryption
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
-  beforeEach(async function () {
+  beforeEach(async () => {
     localStorage.clear()
 
     context = await Factory.createVaultsContextWithRealCrypto()
 
     await context.launch()
     await context.register()
+  })
 
-    sessions = context.application.sessions
-    encryption = context.encryption
+  afterEach(async () => {
+    await context.deinit()
+    localStorage.clear()
+
+    sinon.restore()
+
+    context = undefined
   })
 
   it('should create keypair during registration', () => {
@@ -38,7 +37,7 @@ describe('public key cryptography', function () {
   it('should populate keypair during sign in', async () => {
     const email = context.email
     const password = context.password
-    await context.signout()
+    await context.deinit()
 
     const recreatedContext = await Factory.createVaultsContextWithRealCrypto()
     await recreatedContext.launch()

packages/snjs/mocha/vaults/shared_vaults.test.js

@@ -24,6 +24,8 @@ describe('shared vaults', function () {
   afterEach(async function () {
     await context.deinit()
     localStorage.clear()
+    sinon.restore()
+    context = undefined
   })
 
   it('should update vault name and description', async () => {

packages/snjs/mocha/vaults/signatures.test.js

@@ -9,11 +9,6 @@ describe('signatures', function () {
 
   let context
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
@@ -23,6 +18,13 @@ describe('signatures', function () {
     await context.register()
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+    context = undefined
+  })
+
   describe('item decryption signature verification', () => {
     it('should have failing signature if contact public key does not match', async () => {
       const { note, contactContext, deinitContactContext } =

packages/snjs/mocha/vaults/vaults.test.js

@@ -9,21 +9,24 @@ describe('vaults', function () {
   let context
   let vaults
 
-  afterEach(async function () {
-    await context.deinit()
-    localStorage.clear()
-  })
-
   beforeEach(async function () {
     localStorage.clear()
 
-    context = await Factory.createVaultsContextWithRealCrypto()
+    context = await Factory.createVaultsContextWithFakeCrypto()
 
     await context.launch()
 
     vaults = context.vaults
   })
 
+  afterEach(async function () {
+    await context.deinit()
+    localStorage.clear()
+    sinon.restore()
+    context = undefined
+    vaults = undefined
+  })
+
   describe('offline', function () {
     it('should be able to create an offline vault', async () => {
       const vault = await vaults.createRandomizedVault({
@@ -77,7 +80,7 @@ describe('vaults', function () {
       await vaults.moveItemToVault(vault, note)
       await context.deinit()
 
-      const recreatedContext = await Factory.createVaultsContextWithRealCrypto(appIdentifier)
+      const recreatedContext = await Factory.createVaultsContextWithFakeCrypto(appIdentifier)
       await recreatedContext.launch()
 
       const updatedNote = recreatedContext.items.findItem(note.uuid)
@@ -101,7 +104,7 @@ describe('vaults', function () {
 
         await context.deinit()
 
-        const recreatedContext = await Factory.createVaultsContextWithRealCrypto(appIdentifier)
+        const recreatedContext = await Factory.createVaultsContextWithFakeCrypto(appIdentifier)
         await recreatedContext.launch()
 
         const notes = recreatedContext.notes
@@ -128,7 +131,7 @@ describe('vaults', function () {
 
         await context.deinit()
 
-        const recreatedContext = await Factory.createVaultsContextWithRealCrypto(appIdentifier)
+        const recreatedContext = await Factory.createVaultsContextWithFakeCrypto(appIdentifier)
         await recreatedContext.launch()
 
         const updatedNote = recreatedContext.items.findItem(note.uuid)
@@ -181,7 +184,7 @@ describe('vaults', function () {
         await vaults.moveItemToVault(vault, note)
         await context.deinit()
 
-        const recreatedContext = await Factory.createVaultsContextWithRealCrypto(appIdentifier)
+        const recreatedContext = await Factory.createVaultsContextWithFakeCrypto(appIdentifier)
         await recreatedContext.launch()
 
         const updatedNote = recreatedContext.items.findItem(note.uuid)