Skip to content

Commit

Permalink
Start cleaning up tests
Browse files Browse the repository at this point in the history
  • Loading branch information
brianc committed Jun 15, 2017
1 parent 3074436 commit d615ebe
Show file tree
Hide file tree
Showing 25 changed files with 392 additions and 435 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
},
"devDependencies": {
"async": "0.9.0",
"co": "4.6.0",
"jshint": "2.5.2",
"pg-copy-streams": "0.3.0"
},
Expand Down
28 changes: 16 additions & 12 deletions test/integration/client/appname-tests.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
return;
var helper = require('./test-helper');
var Client = helper.Client;

var suite = new helper.Suite();

var conInfo = helper.config;

function getConInfo(override) {
Expand All @@ -26,34 +27,37 @@ function getAppName(conf, cb) {
}));
}

test('No default appliation_name ', function(){
suite.test('No default appliation_name ', function(done) {
var conf = getConInfo();
getAppName(conf, function(res){
getAppName({ }, function(res){
assert.strictEqual(res, '');
done()
});
});

test('fallback_application_name is used', function(){
suite.test('fallback_application_name is used', function(done) {
var fbAppName = 'this is my app';
var conf = getConInfo({
'fallback_application_name' : fbAppName
});
getAppName(conf, function(res){
assert.strictEqual(res, fbAppName);
done()
});
});

test('application_name is used', function(){
suite.test('application_name is used', function(done) {
var appName = 'some wired !@#$% application_name';
var conf = getConInfo({
'application_name' : appName
});
getAppName(conf, function(res){
assert.strictEqual(res, appName);
done()
});
});

test('application_name has precedence over fallback_application_name', function(){
suite.test('application_name has precedence over fallback_application_name', function(done) {
var appName = 'some wired !@#$% application_name';
var fbAppName = 'some other strange $$test$$ appname';
var conf = getConInfo({
Expand All @@ -62,10 +66,11 @@ test('application_name has precedence over fallback_application_name', function(
});
getAppName(conf, function(res){
assert.strictEqual(res, appName);
done()
});
});

test('application_name from connection string', function(){
suite.test('application_name from connection string', function(done) {
var appName = 'my app';
var conParams = require(__dirname + '/../../../lib/connection-parameters');
var conf;
Expand All @@ -76,21 +81,20 @@ test('application_name from connection string', function(){
}
getAppName(conf, function(res){
assert.strictEqual(res, appName);
done()
});
});



// TODO: make the test work for native client too
if (!helper.args.native) {
test('application_name is read from the env', function(){
suite.test('application_name is read from the env', function(done) {
var appName = process.env.PGAPPNAME = 'testest';
var conf = getConInfo({
'just some bla' : 'to fool the pool'
});
getAppName(conf, function(res){
getAppName({ }, function(res){
delete process.env.PGAPPNAME;
assert.strictEqual(res, appName);
done()
});
});
}
Loading

0 comments on commit d615ebe

Please sign in to comment.