Merge pull request brianc#2221 from sehrope/misc-test-cleanup

Test require clean up and refactoring to remove BufferList global

Author: charmander

packages/pg/test/buffer-list.js

@@ -1,5 +1,6 @@
 'use strict'
-global.BufferList = function () {
+
+const BufferList = function () {
   this.buffers = []
 }
 var p = BufferList.prototype

packages/pg/test/cli.js

@@ -1,5 +1,5 @@
 'use strict'
-var ConnectionParameters = require(__dirname + '/../lib/connection-parameters')
+var ConnectionParameters = require('../lib/connection-parameters')
 var config = new ConnectionParameters(process.argv[2])
 
 for (var i = 0; i < process.argv.length; i++) {

packages/pg/test/integration/client/api-tests.js

@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 var suite = new helper.Suite()

packages/pg/test/integration/client/appname-tests.js

@@ -71,7 +71,7 @@ suite.test('application_name has precedence over fallback_application_name', fun
 
 suite.test('application_name from connection string', function (done) {
   var appName = 'my app'
-  var conParams = require(__dirname + '/../../../lib/connection-parameters')
+  var conParams = require('../../../lib/connection-parameters')
   var conf
   if (process.argv[2]) {
     conf = new conParams(process.argv[2] + '?application_name=' + appName)

packages/pg/test/integration/client/array-tests.js

@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var pg = helper.pg
 
 var suite = new helper.Suite()

packages/pg/test/integration/client/query-as-promise-tests.js

@@ -1,6 +1,6 @@
 'use strict'
 var bluebird = require('bluebird')
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 process.on('unhandledRejection', function (e) {

packages/pg/test/integration/client/query-column-names-tests.js

@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/../test-helper')
+var helper = require('../test-helper')
 var pg = helper.pg
 
 new helper.Suite().test('support for complex column names', function () {

packages/pg/test/integration/client/ssl-tests.js

@@ -1,6 +1,6 @@
 'use strict'
-var pg = require(__dirname + '/../../../lib')
-var config = require(__dirname + '/test-helper').config
+var pg = require('../../../lib')
+var config = require('./test-helper').config
 test('can connect with ssl', function () {
   return false
   config.ssl = {

packages/pg/test/integration/client/type-coercion-tests.js

@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 var pg = helper.pg
 var sink
 const suite = new helper.Suite()

packages/pg/test/integration/connection/bound-command-tests.js

@@ -1,5 +1,5 @@
 'use strict'
-var helper = require(__dirname + '/test-helper')
+var helper = require('./test-helper')
 // http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
 
 test('flushing once', function () {