style tests pass

chrisdickinson · chrisdickinson · commit 37c08c4a45cf · 2016-01-08T02:40:50.000-08:00
diff --git a/test/basic-api-errors-test.js b/test/basic-api-errors-test.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const domain = require('domain')
 const test = require('tap').test
 
@@ -32,11 +31,11 @@ test('test getConnection after release', assert => {
   const domain1 = domain.create()
 
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.transaction(() => {
       const session = db.session
-      setImmediate(err => {
+      setImmediate(() => {
         session.getConnection()
           .then(pair => { throw new Error('should not reach here') })
           .catch(db.NoSessionAvailable, () => assert.ok(1, 'caught err'))
@@ -54,7 +53,7 @@ test('test getConnection after release', assert => {
       connection: {query (sql, ready) {
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -64,11 +63,11 @@ test('test transaction after release', assert => {
   const domain1 = domain.create()
 
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.transaction(() => {
       const session = db.session
-      setImmediate(err => {
+      setImmediate(() => {
         session.transaction(() => {})
           .then(pair => { throw new Error('should not reach here') })
           .catch(db.NoSessionAvailable, () => assert.ok(1, 'caught err'))
@@ -86,7 +85,7 @@ test('test transaction after release', assert => {
       connection: {query (sql, ready) {
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
diff --git a/test/basic-atomic-error-test.js b/test/basic-atomic-error-test.js
@@ -46,7 +46,7 @@ test('test error in previous query', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -58,13 +58,13 @@ test('test error in BEGIN', assert => {
   class BeginError extends Error {}
 
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.atomic(() => {
       assert.fail('should not reach here.')
     })()
   })
-  .catch(BeginError, err => assert.ok(1, 'caught expected err'))
+  .catch(BeginError, () => assert.ok(1, 'caught expected err'))
   .catch(err => assert.fail(err))
   .finally(() => domain1.exit())
   .finally(assert.end)
@@ -82,7 +82,7 @@ test('test error in BEGIN', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -94,7 +94,7 @@ test('test error in COMMIT', assert => {
   class CommitError extends Error {}
 
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.atomic(() => {
       return db.getConnection().then(pair => pair.release())
@@ -113,7 +113,7 @@ test('test error in COMMIT', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -157,7 +157,7 @@ test('test error in ROLLBACK: does not reuse connection', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
diff --git a/test/basic-atomic-from-session-test.js b/test/basic-atomic-from-session-test.js
@@ -1,6 +1,5 @@
 'use strict'
 
-const Promise = require('bluebird')
 const domain = require('domain')
 const test = require('tap').test
 
diff --git a/test/basic-rollback-test.js b/test/basic-rollback-test.js
@@ -1,5 +1,5 @@
 'use strict'
-const Promise = require('bluebird')
+
 const domain = require('domain')
 const test = require('tap').test
 
@@ -12,7 +12,7 @@ test('rolling back transaction calls ROLLBACK', assert => {
 
   LOGS.length = 0
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.transaction(() => {
       throw new Error('no thanks')
@@ -29,7 +29,7 @@ test('rolling back transaction calls ROLLBACK', assert => {
         LOGS.push(sql)
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -40,7 +40,7 @@ test('rolling back atomic calls ROLLBACK', assert => {
 
   LOGS.length = 0
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.atomic(() => {
       throw new Error('no thanks')
@@ -64,7 +64,7 @@ ROLLBACK
         LOGS.push(sql)
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
diff --git a/test/basic-transaction-error-test.js b/test/basic-transaction-error-test.js
@@ -46,7 +46,7 @@ test('test error in previous query', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -58,13 +58,13 @@ test('test error in BEGIN', assert => {
   class BeginError extends Error {}
 
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.transaction(() => {
       assert.fail('should not reach here.')
     })()
   })
-  .catch(BeginError, err => assert.ok(1, 'caught expected err'))
+  .catch(BeginError, () => assert.ok(1, 'caught expected err'))
   .catch(err => assert.fail(err))
   .finally(() => domain1.exit())
   .finally(assert.end)
@@ -82,7 +82,7 @@ test('test error in BEGIN', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -94,7 +94,7 @@ test('test error in COMMIT', assert => {
   class CommitError extends Error {}
 
   db.install(domain1, getConnection, {maxConcurrency: 0})
-  
+
   domain1.run(() => {
     return db.transaction(() => {
       return db.getConnection().then(pair => pair.release())
@@ -113,7 +113,7 @@ test('test error in COMMIT', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }
@@ -157,7 +157,7 @@ test('test error in ROLLBACK: does not reuse connection', assert => {
         }
         return ready()
       }},
-      release (err) {
+      release () {
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ test('test error in previous query', assert => {`
`46`	`46`	`}`
`47`	`47`	`return ready()`
`48`	`48`	`}},`
`49`		`- release (err) {`
	`49`	`+ release () {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
`@@ -58,13 +58,13 @@ test('test error in BEGIN', assert => {`
`58`	`58`	`class BeginError extends Error {}`
`59`	`59`
`60`	`60`	`db.install(domain1, getConnection, {maxConcurrency: 0})`
`61`		`-`
	`61`	`+`
`62`	`62`	`domain1.run(() => {`
`63`	`63`	`return db.atomic(() => {`
`64`	`64`	`assert.fail('should not reach here.')`
`65`	`65`	`})()`
`66`	`66`	`})`
`67`		`- .catch(BeginError, err => assert.ok(1, 'caught expected err'))`
	`67`	`+ .catch(BeginError, () => assert.ok(1, 'caught expected err'))`
`68`	`68`	`.catch(err => assert.fail(err))`
`69`	`69`	`.finally(() => domain1.exit())`
`70`	`70`	`.finally(assert.end)`
`@@ -82,7 +82,7 @@ test('test error in BEGIN', assert => {`
`82`	`82`	`}`
`83`	`83`	`return ready()`
`84`	`84`	`}},`
`85`		`- release (err) {`
	`85`	`+ release () {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -94,7 +94,7 @@ test('test error in COMMIT', assert => {`
`94`	`94`	`class CommitError extends Error {}`
`95`	`95`
`96`	`96`	`db.install(domain1, getConnection, {maxConcurrency: 0})`
`97`		`-`
	`97`	`+`
`98`	`98`	`domain1.run(() => {`
`99`	`99`	`return db.atomic(() => {`
`100`	`100`	`return db.getConnection().then(pair => pair.release())`
`@@ -113,7 +113,7 @@ test('test error in COMMIT', assert => {`
`113`	`113`	`}`
`114`	`114`	`return ready()`
`115`	`115`	`}},`
`116`		`- release (err) {`
	`116`	`+ release () {`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`	`}`
`@@ -157,7 +157,7 @@ test('test error in ROLLBACK: does not reuse connection', assert => {`
`157`	`157`	`}`
`158`	`158`	`return ready()`
`159`	`159`	`}},`
`160`		`- release (err) {`
	`160`	`+ release () {`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`}`