Prevent dangling transactions

Antonio Scandurra · Antonio Scandurra · commit ec57ad6d29b0 · 2016-07-13T16:22:22.000+02:00
diff --git a/lib/models/repository.js b/lib/models/repository.js
@@ -26,10 +26,13 @@ export default class Repository {
     if (this.rawRepository) throw new Error('A transaction is already started. Nested transactions are not supported.')
 
     return this.rawRepositoryPool.enqueue(async (rawRepositoryPromise) => {
-      this.rawRepository = await rawRepositoryPromise
-      let result = await fn()
-      this.rawRepository = null
-      return result
+      try {
+        this.rawRepository = await rawRepositoryPromise
+        let result = await fn()
+        return result
+      } finally {
+        this.rawRepository = null
+      }
     })
   }
 
diff --git a/test/models/repository.test.js b/test/models/repository.test.js
@@ -38,13 +38,24 @@ describe('Repository', () => {
       assert.deepEqual(actualEvents, expectedEvents)
     })
 
-    it('does not allow transactions to nest', async function () {
+    it('does not allow transactions to nest', async () => {
       const workingDirPath = copyRepositoryDir(1)
       const repo = await buildRepository(workingDirPath)
       await repo.transact(function () {
         assert.throws(() => repo.transact(), /Nested transaction/)
       })
     })
+
+    it('allows to create a new transaction if the previous one throws an error', async () => {
+      const workingDirPath = copyRepositoryDir(1)
+      const repo = await buildRepository(workingDirPath)
+      let executed = false
+      try {
+        await repo.transact(async () => { throw new Error('An error!') })
+      } catch (e) { }
+      await repo.transact(async () => { executed = true })
+      assert(executed)
+    })
   })
 
   describe('refreshing', () => {
