Skip to content

Commit eeb62ba

Browse files
committed
test: Replace __dirname concatenations in require(...) with relative paths
Replaces __dirname concatentation in pg test scripts so that editors like VS Code can automatically generate typings and support code navigation (F12).
1 parent f3136a7 commit eeb62ba

30 files changed

+45
-45
lines changed

packages/pg/test/cli.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var ConnectionParameters = require(__dirname + '/../lib/connection-parameters')
2+
var ConnectionParameters = require('../lib/connection-parameters')
33
var config = new ConnectionParameters(process.argv[2])
44

55
for (var i = 0; i < process.argv.length; i++) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
2+
var helper = require('../test-helper')
33
var pg = helper.pg
44

55
var suite = new helper.Suite()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ suite.test('application_name has precedence over fallback_application_name', fun
7171

7272
suite.test('application_name from connection string', function (done) {
7373
var appName = 'my app'
74-
var conParams = require(__dirname + '/../../../lib/connection-parameters')
74+
var conParams = require('../../../lib/connection-parameters')
7575
var conf
7676
if (process.argv[2]) {
7777
conf = new conParams(process.argv[2] + '?application_name=' + appName)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
var pg = helper.pg
44

55
var suite = new helper.Suite()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22
var bluebird = require('bluebird')
3-
var helper = require(__dirname + '/../test-helper')
3+
var helper = require('../test-helper')
44
var pg = helper.pg
55

66
process.on('unhandledRejection', function (e) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
2+
var helper = require('../test-helper')
33
var pg = helper.pg
44

55
new helper.Suite().test('support for complex column names', function () {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
var pg = require(__dirname + '/../../../lib')
3-
var config = require(__dirname + '/test-helper').config
2+
var pg = require('../../../lib')
3+
var config = require('./test-helper').config
44
test('can connect with ssl', function () {
55
return false
66
config.ssl = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
var pg = helper.pg
44
var sink
55
const suite = new helper.Suite()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
// http://developer.postgresql.org/pgdocs/postgres/protocol-flow.html#PROTOCOL-FLOW-EXT-QUERY
44

55
test('flushing once', function () {

packages/pg/test/integration/connection/copy-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
var assert = require('assert')
44

55
test('COPY FROM events check', function () {

packages/pg/test/integration/connection/notification-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
// http://www.postgresql.org/docs/8.3/static/libpq-notify.html
44
test('recieves notification from same connection with no payload', function () {
55
helper.connect(function (con) {

packages/pg/test/integration/connection/query-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
var assert = require('assert')
44

55
var rows = []

packages/pg/test/integration/connection/test-helper.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict'
22
var net = require('net')
3-
var helper = require(__dirname + '/../test-helper')
4-
var Connection = require(__dirname + '/../../../lib/connection')
5-
var utils = require(__dirname + '/../../../lib/utils')
3+
var helper = require('../test-helper')
4+
var Connection = require('../../../lib/connection')
5+
var utils = require('../../../lib/utils')
66
var connect = function (callback) {
77
var username = helper.args.user
88
var database = helper.args.database

packages/pg/test/integration/gh-issues/130-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
2+
var helper = require('../test-helper')
33
var exec = require('child_process').exec
44

55
helper.pg.defaults.poolIdleTimeout = 1000

packages/pg/test/integration/gh-issues/507-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
2+
var helper = require('../test-helper')
33
var pg = helper.pg
44

55
new helper.Suite().test('parsing array results', function (cb) {

packages/pg/test/native/stress-tests.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
3-
var Client = require(__dirname + '/../../lib/native')
2+
var helper = require('../test-helper')
3+
var Client = require('../../lib/native')
44
var Query = Client.Query
55

66
test('many rows', function () {

packages/pg/test/test-buffers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
require(__dirname + '/test-helper')
2+
require('./test-helper')
33
// http://developer.postgresql.org/pgdocs/postgres/protocol-message-formats.html
44

55
var buffers = {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
require(__dirname + '/test-helper')
2+
require('./test-helper')
33
var assert = require('assert')
44

55
var pguser = process.env['PGUSER'] || process.env.USER

packages/pg/test/unit/client/escape-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33

44
function createClient(callback) {
55
var client = new Client(helper.config)

packages/pg/test/unit/client/notification-tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33

44
test('passes connection notification', function () {
55
var client = helper.client()

packages/pg/test/unit/client/query-queue-tests.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
3-
var Connection = require(__dirname + '/../../../lib/connection')
2+
var helper = require('./test-helper')
3+
var Connection = require('../../../lib/connection')
44

55
test('drain', function () {
66
var con = new Connection({ stream: 'NO' })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33

44
var testForTag = function (tagText, callback) {
55
test('includes command tag data for tag ' + tagText, function () {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
2+
var helper = require('./test-helper')
33
var Query = require('../../../lib/query')
44

55
test('executing query', function () {

packages/pg/test/unit/client/stream-and-query-error-interaction-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
3-
var Connection = require(__dirname + '/../../../lib/connection')
4-
var Client = require(__dirname + '/../../../lib/client')
2+
var helper = require('./test-helper')
3+
var Connection = require('../../../lib/connection')
4+
var Client = require('../../../lib/client')
55

66
test('emits end when not in query', function () {
77
var stream = new (require('events').EventEmitter)()

packages/pg/test/unit/connection-parameters/creation-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
2+
var helper = require('../test-helper')
33
var assert = require('assert')
4-
var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters')
5-
var defaults = require(__dirname + '/../../../lib').defaults
4+
var ConnectionParameters = require('../../../lib/connection-parameters')
5+
var defaults = require('../../../lib').defaults
66

77
// clear process.env
88
for (var key in process.env) {

packages/pg/test/unit/connection-parameters/environment-variable-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
2-
var helper = require(__dirname + '/../test-helper')
2+
var helper = require('../test-helper')
33
const Suite = require('../../suite')
44

55
var assert = require('assert')
6-
var ConnectionParameters = require(__dirname + '/../../../lib/connection-parameters')
7-
var defaults = require(__dirname + '/../../../lib').defaults
6+
var ConnectionParameters = require('../../../lib/connection-parameters')
7+
var defaults = require('../../../lib').defaults
88

99
// clear process.env
1010
var realEnv = {}

packages/pg/test/unit/connection/error-tests.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
var helper = require(__dirname + '/test-helper')
3-
var Connection = require(__dirname + '/../../../lib/connection')
2+
var helper = require('./test-helper')
3+
var Connection = require('../../../lib/connection')
44
var net = require('net')
55

66
const suite = new helper.Suite()

packages/pg/test/unit/connection/inbound-parser-tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict'
2-
require(__dirname + '/test-helper')
3-
var Connection = require(__dirname + '/../../../lib/connection')
4-
var buffers = require(__dirname + '/../../test-buffers')
2+
require('./test-helper')
3+
var Connection = require('../../../lib/connection')
4+
var buffers = require('../../test-buffers')
55
var PARSE = function (buffer) {
66
return new Parser(buffer).parse()
77
}

packages/pg/test/unit/connection/startup-tests.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
2-
require(__dirname + '/test-helper')
3-
var Connection = require(__dirname + '/../../../lib/connection')
2+
require('./test-helper')
3+
var Connection = require('../../../lib/connection')
44
test('connection can take existing stream', function () {
55
var stream = new MemoryStream()
66
var con = new Connection({ stream: stream })
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
'use strict'
2-
module.exports = require(__dirname + '/../test-helper')
2+
module.exports = require('../test-helper')

0 commit comments

Comments
 (0)