Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-03-09 00:18:26 +01:00
Code Issues Projects Releases Wiki Activity

chore: Make options more testable

Browse Source
This commit is contained in:
ivaosthu 2019-05-22 09:29:56 +02:00
parent 0e6f5acdd1
commit 5ae61e6fc3
2 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/options.js
View File

@ -6,11 +6,9 @@ const { defaultLogProvider, validateLogProvider } = require('./logger');
const isDev = () => process.env.NODE_ENV === 'development'; const isDev = () => process.env.NODE_ENV === 'development';
const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000; const THIRTY_DAYS = 30 * 24 * 60 * 60 * 1000;
const DEFAULT_OPTIONS = { function defaultOptions() {
databaseUrl: return {
process.env.DATABASE_URL || process.env.DATABASE_HOST databaseUrl: defaultDatabaseUrl(),
? defaultDatabaseUrl()
: undefined,
databaseSchema: 'public', databaseSchema: 'public',
port: process.env.HTTP_PORT || process.env.PORT || 4242, port: process.env.HTTP_PORT || process.env.PORT || 4242,
host: process.env.HTTP_HOST, host: process.env.HTTP_HOST,
@ -29,8 +27,12 @@ const DEFAULT_OPTIONS = {
dropBeforeImport: false, dropBeforeImport: false,
getLogger: defaultLogProvider, getLogger: defaultLogProvider,
}; };
}
function defaultDatabaseUrl() { function defaultDatabaseUrl() {
if (process.env.DATABASE_URL) {
return process.env.DATABASE_URL;
} else if (isDev() || process.env.DATABASE_HOST) {
const dbUsername = process.env.DATABASE_USERNAME || 'unleash_user'; const dbUsername = process.env.DATABASE_USERNAME || 'unleash_user';
const dbPassword = process.env.DATABASE_PASSWORD || 'passord'; const dbPassword = process.env.DATABASE_PASSWORD || 'passord';
const dbHost = process.env.DATABASE_HOST || 'localhost'; const dbHost = process.env.DATABASE_HOST || 'localhost';
@ -38,16 +40,14 @@ function defaultDatabaseUrl() {
const dbName = process.env.DATABASE_NAME || 'unleash'; const dbName = process.env.DATABASE_NAME || 'unleash';
const sslSupport = process.env.DATABASE_SSL || 'true'; const sslSupport = process.env.DATABASE_SSL || 'true';
return `postgres://${dbUsername}:${dbPassword}@${dbHost}:${dbPort}/${dbName}?ssl=${sslSupport}`; return `postgres://${dbUsername}:${dbPassword}@${dbHost}:${dbPort}/${dbName}?ssl=${sslSupport}`;
} else {
return undefined;
}
} }
module.exports = { module.exports = {
createOptions: opts => { createOptions: opts => {
const options = Object.assign({}, DEFAULT_OPTIONS, opts); const options = Object.assign({}, defaultOptions(), opts);
// If we are running in development we should assume local db
if (isDev() && !options.databaseUrl) {
options.databaseUrl = defaultDatabaseUrl();
}
if (!options.databaseUrl) { if (!options.databaseUrl) {
throw new Error( throw new Error(

21
lib/options.test.js
View File

@ -13,6 +13,7 @@ test('should require DATABASE_URI', t => {
}); });
test('should set default databaseUrl for develpment', t => { test('should set default databaseUrl for develpment', t => {
delete process.env.NODE_ENV;
process.env.NODE_ENV = 'development'; process.env.NODE_ENV = 'development';
const { createOptions } = require('./options'); const { createOptions } = require('./options');
@ -24,6 +25,26 @@ test('should set default databaseUrl for develpment', t => {
); );
}); });
test('should use DATABASE_URL from env', t => {
const databaseUrl = 'postgres://u:p@localhost:5432/name';
delete process.env.NODE_ENV;
process.env.DATABASE_URL = databaseUrl;
const { createOptions } = require('./options');
const options = createOptions({});
t.true(options.databaseUrl === databaseUrl);
});
test('should use databaseUrl from options', t => {
const databaseUrl = 'postgres://u:p@localhost:5432/name';
const { createOptions } = require('./options');
const options = createOptions({ databaseUrl });
t.true(options.databaseUrl === databaseUrl);
});
test('should not override provided options', t => { test('should not override provided options', t => {
process.env.DATABASE_URL = 'test'; process.env.DATABASE_URL = 'test';
process.env.NODE_ENV = 'production'; process.env.NODE_ENV = 'production';