Merge pull request #7 from npm/jpg619/fix-non-bb-catch-style

Replace non Bluebird catch styles

Author: jpg619

.gitignore

@@ -1 +1,3 @@
 coverage/
+node_modules
+package-lock.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npm/pg-db-session",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "domain-attached database sessions",
   "main": "db-session.js",
   "scripts": {

test/basic-api-errors-test.js

@@ -11,8 +11,12 @@ test('test transaction outside of session', assert => {
 
   testTransaction()
     .then(() => { throw new Error('expected error') })
-    .catch(db.NoSessionAvailable, () => assert.end())
-    .catch(err => assert.end(err))
+    .catch(err => {
+      if(err instanceof db.NoSessionAvailable) {
+          assert.end()
+      }
+      assert.end(err)
+    })
 })
 
 test('test atomic outside of session', assert => {
@@ -21,8 +25,12 @@ test('test atomic outside of session', assert => {
 
   testAtomic()
     .then(() => { throw new Error('expected error') })
-    .catch(db.NoSessionAvailable, () => assert.end())
-    .catch(err => assert.end(err))
+    .catch(err => {
+      if(err instanceof db.NoSessionAvailable) {
+          assert.end()
+      }
+      assert.end(err)
+    })
 })
 
 test('test getConnection after release', assert => {
@@ -36,8 +44,12 @@ test('test getConnection after release', assert => {
       setImmediate(() => {
         session.getConnection()
           .then(pair => { throw new Error('should not reach here') })
-          .catch(db.NoSessionAvailable, () => assert.ok(1, 'caught err'))
-          .catch(err => assert.fail(err))
+          .catch(err => {
+            if(err instanceof db.NoSessionAvailable) {
+                assert.ok(1, 'caught err')
+            }
+            assert.fail(err)
+          })
           .finally(assert.end)
       })
     })()
@@ -67,8 +79,12 @@ test('test transaction after release', assert => {
       setImmediate(() => {
         session.transaction(() => {})
           .then(pair => { throw new Error('should not reach here') })
-          .catch(db.NoSessionAvailable, () => assert.ok(1, 'caught err'))
-          .catch(err => assert.fail(err))
+          .catch(err => {
+            if(err instanceof db.NoSessionAvailable) {
+                assert.ok(1, 'caught err')
+            }
+            assert.fail(err)
+          })
           .finally(assert.end)
       })
     })()

test/basic-atomic-error-test.js

@@ -64,8 +64,12 @@ test('test error in BEGIN', assert => {
       assert.fail('should not reach here.')
     })()
   })
-  .catch(BeginError, () => assert.ok(1, 'caught expected err'))
-  .catch(err => assert.fail(err))
+  .catch(err => {
+    if(err instanceof BeginError) {
+        assert.ok(1, 'caught expected err')
+    }
+    assert.fail(err)
+  })
   .finally(() => domain1.exit())
   .finally(assert.end)
 
@@ -100,8 +104,12 @@ test('test error in COMMIT', assert => {
       return db.getConnection().then(pair => pair.release())
     })()
   })
-  .catch(CommitError, () => assert.ok(1, 'caught expected error'))
-  .catch(err => assert.fail(err))
+  .catch(err => {
+    if(err instanceof CommitError) {
+        assert.ok(1, 'caught expected error')
+    } 
+    assert.fail(err)
+  })
   .finally(() => domain1.exit())
   .finally(assert.end)
 

test/basic-session-error-test.js

@@ -25,11 +25,17 @@ test('cannot connect', assert => {
     })
   }).then(() => {
     throw new Error('expected an exception')
-  }).catch(TestError, () => assert.ok(1, 'saw exception')).then(() => {
-    domain1.exit()
+  }).catch(err => {
+    if(err instanceof TestError) {
+        assert.ok(1, 'saw exception')
+    } else {
+        throw err
+    }
+  }).then(() => {
+      domain1.exit()
   }).then(() => assert.end())
-    .catch(assert.end)
-})
+      .catch(assert.end)
+  })
 
 // what happens when there's an error querying?
 test('query error', assert => {

test/basic-transaction-error-test.js

@@ -64,8 +64,12 @@ test('test error in BEGIN', assert => {
       assert.fail('should not reach here.')
     })()
   })
-  .catch(BeginError, () => assert.ok(1, 'caught expected err'))
-  .catch(err => assert.fail(err))
+  .catch(err => {
+    if(err instanceof BeginError) {
+        assert.ok(1, 'caught expected err')
+    }
+    assert.fail(err)
+  })
   .finally(() => domain1.exit())
   .finally(assert.end)
 
@@ -100,8 +104,12 @@ test('test error in COMMIT', assert => {
       return db.getConnection().then(pair => pair.release())
     })()
   })
-  .catch(CommitError, () => assert.ok(1, 'caught expected error'))
-  .catch(err => assert.fail(err))
+  .catch(err => {
+    if(err instanceof CommitError) {
+        assert.ok(1, 'caught expected error')
+    }
+    assert.fail(err)
+  })
   .finally(() => domain1.exit())
   .finally(assert.end)