merge in #216

Author: gregdingle

test/postgresql.initialization.test.js

@@ -4,50 +4,51 @@
 // License text available at https://opensource.org/licenses/Artistic-2.0
 
 'use strict';
+require('./init');
 
 var connector = require('..');
 var DataSource = require('loopback-datasource-juggler').DataSource;
 var should = require('should');
-var db;
 
-before(function() {
-  db = getDBConfig();
-});
+// simple wrapper that uses JSON.parse(JSON.stringify()) as cheap clone
+function newConfig(withURL) {
+  return JSON.parse(JSON.stringify(getDBConfig(withURL)));
+}
 
 describe('initialization', function() {
   it('honours user-defined pg-pool settings', function() {
-    var dataSource = new DataSource(connector, {});
+    var dataSource = new DataSource(connector, newConfig());
     var pool = dataSource.connector.pg.pool;
     pool._factory.max.should.not.equal(999);
 
-    var settings = {max: 999}; // non-default value
+    var settings = newConfig();
+    settings.max = 999; // non-default value
     var dataSource = new DataSource(connector, settings);
     var pool = dataSource.connector.pg.pool;
     pool._factory.max.should.equal(999);
   });
 
   it('honours user-defined url settings', function() {
-    var settings = {url: 'postgres://' + db.username + ':' + db.password + '@' +
-    db.host + ':' + db.port + '/' + db.database};
+    var settings = newConfig();
 
-    var dataSource = new DataSource(connector, {});
+    var dataSource = new DataSource(connector, settings);
     var clientConfig = dataSource.connector.clientConfig;
     should.not.exist(clientConfig.connectionString);
 
+    settings = newConfig(true);
     var dataSource = new DataSource(connector, settings);
     var clientConfig = dataSource.connector.clientConfig;
     clientConfig.connectionString.should.equal(settings.url);
   });
 
   it('honours multiple user-defined settings', function() {
-    var settings = {url: 'postgres://' + db.username + ':' + db.password + '@' +
-    db.host + ':' + db.port + '/' + db.database, max: 999};
+    var urlOnly = {url: newConfig(true).url, max: 999};
 
-    var dataSource = new DataSource(connector, settings);
+    var dataSource = new DataSource(connector, urlOnly);
     var pool = dataSource.connector.pg.pool;
     pool._factory.max.should.equal(999);
 
     var clientConfig = dataSource.connector.clientConfig;
-    clientConfig.connectionString.should.equal(settings.url);
+    clientConfig.connectionString.should.equal(urlOnly.url);
   });
 });