Skip to content

Commit 737496a

Browse files
authored
Remove unused prefix from test env vars (#176)
* TEST_ prefix is not used by CI anymore and therefore serve no purpose * Part of overall goal to standardize env var injection to MODULE_VARNAME (ie. MONGODB_HOST for example) convention
1 parent ce2d382 commit 737496a

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

test/init.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@ var DataSource = require('loopback-datasource-juggler').DataSource;
99
var config = require('rc')('loopback', {test: {postgresql: {}}}).test.postgresql;
1010

1111
if (process.env.CI) {
12-
process.env.PGHOST = process.env.TEST_POSTGRESQL_HOST ||
13-
process.env.POSTGRESQL_HOST || process.env.PGHOST || 'localhost';
14-
process.env.PGPORT = process.env.TEST_POSTGRESQL_PORT ||
15-
process.env.POSTGRESQL_PORT || process.env.PGPORT || 5432;
16-
process.env.PGUSER = process.env.TEST_POSTGRESQL_USER ||
17-
process.env.POSTGRESQL_USER || process.env.PGUSER || 'test';
18-
process.env.PGPASSWORD = process.env.TEST_POSTGRESQL_PASSWORD ||
19-
process.env.POSTGRESQL_PASSWORD || process.env.PGPASSWORD || '';
12+
process.env.PGHOST = process.env.POSTGRESQL_HOST ||
13+
process.env.PGHOST ||
14+
'localhost';
15+
process.env.PGPORT = process.env.POSTGRESQL_PORT ||
16+
process.env.PGPORT ||
17+
5432;
18+
process.env.PGUSER = process.env.POSTGRESQL_USER ||
19+
process.env.PGUSER ||
20+
'test';
21+
process.env.PGPASSWORD = process.env.POSTGRESQL_PASSWORD ||
22+
process.env.PGPASSWORD ||
23+
'';
2024
config = {
2125
host: process.env.PGHOST,
2226
port: process.env.PGPORT,
23-
database: process.env.TEST_POSTGRESQL_DATABASE || 'emptytest',
27+
database: process.env.POSTGRESQL_DATABASE || 'emptytest',
2428
username: process.env.PGUSER,
2529
password: process.env.PGPASSWORD,
2630
};

0 commit comments

Comments
 (0)