Remove test globals (#3264)

* Remove assert from globals

* Remove Client from globals

* Remove global test function

* Remove MemoryStream from globals

* Require assert in SASL integration tests

* Attempt to use a postgres with ssl?

* Use latest image

* Remove connection tests - they test internals that are better covered by testint the client

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
     needs: lint
     services:
       postgres:
-        image: postgres:11
+        image: ghcr.io/railwayapp-templates/postgres-ssl
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres

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

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('../test-helper')
 var pg = helper.pg
+const assert = require('assert')
 
 var suite = new helper.Suite()
 

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

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 var Client = helper.Client
+const assert = require('assert')
 
 var suite = new helper.Suite()
 

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

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 var pg = helper.pg
+const assert = require('assert')
 
 var suite = new helper.Suite()
 

packages/pg/test/integration/client/big-simple-query-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 var Query = helper.pg.Query
+const assert = require('assert')
 
 const suite = new helper.Suite()
 

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

@@ -1,6 +1,8 @@
 'use strict'
 var helper = require('./test-helper')
 var pg = helper.pg
+const assert = require('assert')
+const { Client } = helper
 
 var suite = new helper.Suite()
 

packages/pg/test/integration/client/connection-timeout-tests.js

@@ -2,6 +2,7 @@
 const net = require('net')
 const buffers = require('../../test-buffers')
 const helper = require('./test-helper')
+const assert = require('assert')
 
 const suite = new helper.Suite()
 

packages/pg/test/integration/client/custom-types-tests.js

@@ -2,6 +2,7 @@
 const helper = require('./test-helper')
 const Client = helper.pg.Client
 const suite = new helper.Suite()
+const assert = require('assert')
 
 const customTypes = {
   getTypeParser: () => () => 'okay!',

packages/pg/test/integration/client/empty-query-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 const suite = new helper.Suite()
+const assert = require('assert')
 
 suite.test('empty query message handling', function (done) {
   const client = helper.client()

packages/pg/test/integration/client/error-handling-tests.js

@@ -3,6 +3,7 @@
 var helper = require('./test-helper')
 
 var pg = helper.pg
+const assert = require('assert')
 const Client = pg.Client
 const DatabaseError = pg.DatabaseError
 

packages/pg/test/integration/client/huge-numeric-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 const pool = new helper.pg.Pool()
+const assert = require('assert')
 
 pool.connect(
   assert.success(function (client, done) {

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

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 var Client = helper.Client
+const assert = require('assert')
 
 var suite = new helper.Suite()
 

packages/pg/test/integration/client/network-partition-tests.js

@@ -2,6 +2,7 @@
 var buffers = require('../../test-buffers')
 var helper = require('./test-helper')
 var suite = new helper.Suite()
+const assert = require('assert')
 
 var net = require('net')
 

packages/pg/test/integration/client/no-data-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 const suite = new helper.Suite()
+const assert = require('assert')
 
 suite.test('noData message handling', function () {
   var client = helper.client()

packages/pg/test/integration/client/no-row-result-tests.js

@@ -3,6 +3,7 @@ var helper = require('./test-helper')
 var pg = helper.pg
 const suite = new helper.Suite()
 const pool = new pg.Pool()
+const assert = require('assert')
 
 suite.test('can access results when no rows are returned', function (done) {
   var checkResult = function (result) {

packages/pg/test/integration/client/parse-int-8-tests.js

@@ -3,6 +3,7 @@
 var helper = require('../test-helper')
 var pg = helper.pg
 const suite = new helper.Suite()
+const assert = require('assert')
 
 const pool = new pg.Pool(helper.config)
 suite.test('ability to turn on and off parser', function () {

packages/pg/test/integration/client/prepared-statement-tests.js

@@ -2,6 +2,7 @@
 var helper = require('./test-helper')
 var Query = helper.pg.Query
 
+const assert = require('assert')
 var suite = new helper.Suite()
 
 ;(function () {

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

@@ -2,6 +2,7 @@
 
 const helper = require('./test-helper')
 const pg = helper.pg
+const assert = require('assert')
 
 const suite = new helper.Suite()
 

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

@@ -2,6 +2,7 @@
 var bluebird = require('bluebird')
 var helper = require('../test-helper')
 var pg = helper.pg
+const assert = require('assert')
 
 process.on('unhandledRejection', function (e) {
   console.error(e, e.stack)

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

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('../test-helper')
 var pg = helper.pg
+const assert = require('assert')
 
 new helper.Suite().test('support for complex column names', function () {
   const pool = new pg.Pool()

packages/pg/test/integration/client/query-error-handling-prepared-statement-tests.js

@@ -1,6 +1,8 @@
 'use strict'
 var helper = require('./test-helper')
 var Query = helper.pg.Query
+const { Client } = helper
+const assert = require('assert')
 
 var suite = new helper.Suite()
 

packages/pg/test/integration/client/query-error-handling-tests.js

@@ -2,8 +2,11 @@
 var helper = require('./test-helper')
 var Query = helper.pg.Query
 var DatabaseError = helper.pg.DatabaseError
+const assert = require('assert')
+const { Client } = helper
+const suite = new helper.Suite()
 
-test('error during query execution', function () {
+suite.test('error during query execution', function () {
   var client = new Client(helper.args)
   client.connect(
     assert.success(function () {
@@ -60,7 +63,7 @@ if (helper.config.native) {
   return
 }
 
-test('9.3 column error fields', function () {
+suite.test('9.3 column error fields', function () {
   var client = new Client(helper.args)
   client.connect(
     assert.success(function () {
@@ -89,7 +92,7 @@ test('9.3 column error fields', function () {
   )
 })
 
-test('9.3 constraint error fields', function () {
+suite.test('9.3 constraint error fields', function () {
   var client = new Client(helper.args)
   client.connect(
     assert.success(function () {

packages/pg/test/integration/client/result-metadata-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 var pg = helper.pg
+const assert = require('assert')
 
 const pool = new pg.Pool()
 new helper.Suite().test('should return insert metadata', function () {

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

@@ -1,12 +1,14 @@
 'use strict'
 var util = require('util')
 var helper = require('./test-helper')
+const assert = require('assert')
+const suite = new helper.Suite()
 
 var Client = helper.Client
 
 var conInfo = helper.config
 
-test('returns results as array', function () {
+suite.test('returns results as array', function () {
   var client = new Client(conInfo)
   var checkRow = function (row) {
     assert(util.isArray(row), 'row should be an array')

packages/pg/test/integration/client/row-description-on-results-tests.js

@@ -1,5 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
+const assert = require('assert')
+const suite = new helper.Suite()
 
 var Client = helper.Client
 
@@ -17,7 +19,7 @@ var checkResult = function (result) {
   assert.equal(fields[2].dataTypeID, 25)
 }
 
-test('row descriptions on result object', function () {
+suite.test('row descriptions on result object', function () {
   var client = new Client(conInfo)
   client.connect(
     assert.success(function () {
@@ -33,7 +35,7 @@ test('row descriptions on result object', function () {
   )
 })
 
-test('row description on no rows', function () {
+suite.test('row description on no rows', function () {
   var client = new Client(conInfo)
   client.connect(
     assert.success(function () {

packages/pg/test/integration/client/sasl-scram-tests.js

@@ -3,6 +3,7 @@ const helper = require('./../test-helper')
 const pg = helper.pg
 const suite = new helper.Suite()
 const { native } = helper.args
+const assert = require('assert')
 
 /**
  * This test only executes if the env variables SCRAM_TEST_PGUSER and

packages/pg/test/integration/client/simple-query-tests.js

@@ -1,6 +1,9 @@
 'use strict'
 var helper = require('./test-helper')
 var Query = helper.pg.Query
+const assert = require('assert')
+const suite = new helper.Suite()
+const test = suite.test.bind(suite)
 
 // before running this test make sure you run the script create-test-tables
 test('simple query interface', function () {

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

@@ -1,19 +1,22 @@
 'use strict'
-var pg = require('../../../lib')
-var config = require('./test-helper').config
-test('can connect with ssl', function () {
-  return false
-  config.ssl = {
-    rejectUnauthorized: false,
+const helper = require('./test-helper')
+const assert = require('assert')
+const suite = new helper.Suite()
+
+suite.test('can connect with ssl', function () {
+  const config = {
+    ...helper.config,
+    ssl: {
+      rejectUnauthorized: false,
+    },
   }
-  pg.connect(
-    config,
-    assert.success(function (client) {
-      return false
+  const client = new helper.pg.Client(config)
+  client.connect(
+    assert.success(function () {
       client.query(
         'SELECT NOW()',
         assert.success(function () {
-          pg.end()
+          client.end()
         })
       )
     })

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

@@ -2,6 +2,7 @@
 var helper = require('./test-helper')
 var Client = helper.Client
 
+const assert = require('assert')
 var suite = new helper.Suite()
 
 var conInfo = helper.config

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

@@ -1,5 +1,6 @@
 'use strict'
 var helper = require('./../test-helper')
+const assert = require('assert')
 
 var oldTz = process.env.TZ
 process.env.TZ = 'Europe/Berlin'

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

@@ -2,6 +2,7 @@
 var helper = require('./test-helper')
 const suite = new helper.Suite()
 const pg = helper.pg
+const assert = require('assert')
 
 const client = new pg.Client()
 client.connect(

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

@@ -2,6 +2,7 @@
 var helper = require('./test-helper')
 var pg = helper.pg
 const suite = new helper.Suite()
+const assert = require('assert')
 
 var testForTypeCoercion = function (type) {
   const pool = new pg.Pool()

packages/pg/test/integration/client/type-parser-override-tests.js

@@ -1,5 +1,6 @@
 'use strict'
 var helper = require('./test-helper')
+const assert = require('assert')
 
 function testTypeParser(client, expectedResult, done) {
   var boolValue = true

packages/pg/test/integration/connection-pool/connection-pool-size-tests.js

@@ -5,7 +5,7 @@ const assert = require('assert')
 const suite = new helper.Suite()
 
 const testPoolSize = function (max) {
-  suite.testAsync(`test ${max} queries executed on a pool rapidly`, () => {
+  suite.testAsync(`test ${max} queries executed on a pool rapidly`, async () => {
     const pool = new helper.pg.Pool({ max: 10 })
 
     let count = 0

packages/pg/test/integration/connection-pool/error-tests.js

@@ -2,6 +2,7 @@
 var helper = require('./test-helper')
 const pg = helper.pg
 const native = helper.args.native
+const assert = require('assert')
 
 const suite = new helper.Suite()
 suite.test('connecting to invalid port', (cb) => {

packages/pg/test/integration/connection-pool/idle-timeout-tests.js

@@ -1,5 +1,6 @@
 'use strict'
 var helper = require('./test-helper')
+const assert = require('assert')
 
 new helper.Suite().test('idle timeout', function () {
   const config = Object.assign({}, helper.config, { idleTimeoutMillis: 50 })

packages/pg/test/integration/connection-pool/native-instance-tests.js

@@ -2,6 +2,7 @@
 var helper = require('./../test-helper')
 var pg = helper.pg
 var native = helper.args.native
+const assert = require('assert')
 
 var pool = new pg.Pool()
 

packages/pg/test/integration/connection-pool/yield-support-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 var co = require('co')
+const assert = require('assert')
 
 const pool = new helper.pg.Pool()
 new helper.Suite().test(