vbatts/nodejs-ex
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #42 from PI-Victor/pi-victor/add_tests

Browse source 
add unit tests for post commit hook
This commit is contained in:
Ben Parees 2016-04-11 21:53:34 -04:00
commit 0e8b9b4009
6 changed files with 80 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1 +1,2 @@
/node_modules/
/node_modules/
npm-debug.log

5
openshift/templates/nodejs-mongodb.json
View file

@ -112,7 +112,10 @@
"secret": "${GENERIC_WEBHOOK_SECRET}"
}
}
]
],
"postCommit": {
"script": "npm test"
},
}
},
{

5
openshift/templates/nodejs.json
View file

@ -112,7 +112,10 @@
"secret": "${GENERIC_WEBHOOK_SECRET}"
}
}
]
],
"postCommit": {
"script": "npm test"
},
}
},
{

13
package.json
View file

@ -4,16 +4,21 @@
"description": "Node.js sample app for OpenShift 3",
"main": "server.js",
"dependencies": {
"express": "*",
"mongodb": "*",
"ejs": "*"
"chai": "^3.5.0",
"chai-http": "^2.0.1",
"ejs": "^2.4.1",
"express": "^4.13.4",
"mocha": "^2.4.5",
"mongodb": "^2.1.16",
"morgan": "^1.7.0"
},
"engine": {
"node": "*",
"npm": "*"
},
"scripts": {
"start": "node server.js"
"start": "node server.js",
"test": "IP=0.0.0.0 PORT=3030 mocha --timeout 5000 tests/*_test.js"
},
"repository": {
"type": "git",

56
server.js
View file

@ -1,38 +1,44 @@
// OpenShift sample Node application
var express = require('express');
var fs = require('fs');
var app = express();
var eps = require('ejs');
var express = require('express'),
fs = require('fs'),
app = express(),
eps = require('ejs'),
morgan = require('morgan');
app.engine('html', require('ejs').renderFile);
app.use(morgan('combined'))
var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080,
ip = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0',
mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL,
mongoURLLabel = "";
var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080;
var ip = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0';
var mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL;
var mongoURLLabel = "";
if (mongoURL == null && process.env.DATABASE_SERVICE_NAME) {
var mongoServiceName = process.env.DATABASE_SERVICE_NAME.toUpperCase();
var mongoHost = process.env[mongoServiceName + "_SERVICE_HOST"];
var mongoPort = process.env[mongoServiceName + "_SERVICE_PORT"];
var mongoUser = process.env.MONGODB_USER
if (mongoHost && mongoPort && process.env.MONGODB_DATABASE) {
var mongoServiceName = process.env.DATABASE_SERVICE_NAME.toUpperCase(),
mongoHost = process.env[mongoServiceName + '_SERVICE_HOST'],
mongoPort = process.env[mongoServiceName + '_SERVICE_PORT'],
mongoDatabase = process.env[mongoServiceName + '_DATABASE'],
mongoPassword = process.env[mongoServiceName + '_PASSWORD']
mongoUser = process.env[mongoServiceName + '_USER'];
if (mongoHost && mongoPort && mongoDatabase) {
mongoURLLabel = mongoURL = 'mongodb://';
if (process.env.MONGODB_USER && process.env.MONGODB_PASSWORD) {
mongoURL += process.env.MONGODB_USER + ':' + process.env.MONGODB_PASSWORD + '@';
if (mongoUser && mongoPassword) {
mongoURL += mongoUser + ':' + mongoPassword + '@';
}
// Provide UI label that excludes user id and pw
mongoURLLabel += mongoHost + ':' + mongoPort + '/' + mongoDatabase;
mongoURL += mongoHost + ':' + mongoPort + '/' + mongoDatabase;
mongoURLLabel += mongoHost + ':' + mongoPort + '/' + process.env.MONGODB_DATABASE;
mongoURL += mongoHost + ':' + mongoPort + '/' + process.env.MONGODB_DATABASE;
}
}
var db = null;
var dbDetails = new Object();
var db = null,
dbDetails = new Object();
var initDb = function(callback) {
if (mongoURL == null) return;
var mongodb = require('mongodb');
var mongodb = require('mongodb');
if (mongodb == null) return;
mongodb.connect(mongoURL, function(err, conn) {
@ -46,7 +52,7 @@ var initDb = function(callback) {
dbDetails.url = mongoURLLabel;
dbDetails.type = 'MongoDB';
console.log("Connected to MongoDB at: " + mongoURL);
console.log('Connected to MongoDB at: %s', mongoURL);
});
};
@ -66,9 +72,9 @@ app.get('/', function (req, res) {
app.get('/pagecount', function (req, res) {
if (db) {
db.collection('counts').count(function(err, count ){
res.send('{ pageCount: ' + count +'}');
res.send('{ pageCount: ' + count + '}');
});
} else {
} else {
res.send('{ pageCount: -1 }');
}
});
@ -84,4 +90,6 @@ initDb(function(err){
});
app.listen(port, ip);
console.log('Server running on ' + ip + ':' + port);
console.log('Server running on http://%s:%s', ip, port);
module.exports = app ;

29
tests/app_test.js Normal file
View file

@ -0,0 +1,29 @@
var server = require('../server'),
chai = require('chai'),
chaiHttp = require('chai-http'),
should = chai.should();
chai.use(chaiHttp);
describe('Basic routes tests', function() {
it('GET to / should return 200', function(done){
chai.request(server)
.get('/')
.end(function(err, res) {
res.should.have.status(200);
done();
})
})
it('GET to /pagecount should return 200', function(done){
chai.request(server)
.get('/pagecount')
.end(function(err, res) {
res.should.have.status(200);
done();
})
})
})