disabled create_admin script in test mode
This commit is contained in:
parent
188c48b26c
commit
4d4bb65298
|
@ -7,8 +7,8 @@ require('../../server.js');
|
|||
*/
|
||||
var should = require('should'),
|
||||
mongoose = require('mongoose'),
|
||||
User = mongoose.model('User'),
|
||||
Form = mongoose.model('Form');
|
||||
User = require('../models/user.server.model.js'),
|
||||
Form = require('../models/form.server.model.js');
|
||||
|
||||
/**
|
||||
* Globals
|
||||
|
|
|
@ -6,10 +6,10 @@ var should = require('should'),
|
|||
request = require('supertest'),
|
||||
Session = require('supertest-session'),
|
||||
mongoose = require('mongoose'),
|
||||
User = mongoose.model('User'),
|
||||
Form = mongoose.model('Form'),
|
||||
User = require('../models/user.server.model.js'),
|
||||
Form = require('../models/form.server.model.js'),
|
||||
FormSubmission = require('../models/form_submission.server.model.js'),
|
||||
Field = mongoose.model('Field'),
|
||||
FormSubmission = mongoose.model('FormSubmission'),
|
||||
async = require('async');
|
||||
|
||||
/**
|
||||
|
|
|
@ -11,7 +11,7 @@ var should = require('should'),
|
|||
_ = require('lodash'),
|
||||
async = require('async'),
|
||||
config = require('../../config/config'),
|
||||
FormSubmission = mongoose.model('FormSubmission');
|
||||
FormSubmission = require('../models/form_submission.server.model.js');
|
||||
|
||||
var exampleDemo = {
|
||||
address: '880-9650 Velit. St.',
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
var should = require('should'),
|
||||
mongoose = require('mongoose'),
|
||||
User = mongoose.model('User');
|
||||
User = require('../models/user.server.model.js');
|
||||
|
||||
/**
|
||||
* Globals
|
||||
|
|
|
@ -4,7 +4,7 @@ var should = require('should'),
|
|||
app = require('../../server'),
|
||||
Session = require('supertest-session'),
|
||||
mongoose = require('mongoose'),
|
||||
User = mongoose.model('User'),
|
||||
User = require('../models/user.server.model.js'),
|
||||
config = require('../../config/config'),
|
||||
tmpUser = mongoose.model(config.tempUserCollection),
|
||||
async = require('async');
|
||||
|
|
12
server.js
12
server.js
|
@ -11,7 +11,7 @@ var mongoose = require('mongoose'),
|
|||
* Main application entry file.
|
||||
* Please note that the order of loading is important.
|
||||
*/
|
||||
var bootstrap = module.exports.bootstrap = function() {
|
||||
var bootstrap = function() {
|
||||
//Don't check .env file if we are in travis-ci
|
||||
if(!process.env.TRAVIS) {
|
||||
require('dotenv').config({path: './.env'});
|
||||
|
@ -49,7 +49,7 @@ var bootstrap = module.exports.bootstrap = function() {
|
|||
var app = require('./config/express')(db);
|
||||
|
||||
//Create admin account
|
||||
if (process.env.CREATE_ADMIN_ACCOUNT === 'TRUE') {
|
||||
if (process.env.CREATE_ADMIN_ACCOUNT === 'TRUE' && process.env.NODE_ENV !== 'test') {
|
||||
var create_admin = require('./scripts/create_admin');
|
||||
|
||||
create_admin.run(app, db, function(err){
|
||||
|
@ -59,16 +59,12 @@ var bootstrap = module.exports.bootstrap = function() {
|
|||
});
|
||||
}
|
||||
|
||||
|
||||
// Bootstrap passport config
|
||||
require('./config/passport')();
|
||||
|
||||
// Start the app by listening on <port>
|
||||
app.listen(config.port);
|
||||
|
||||
// Expose app
|
||||
exports = module.exports = app;
|
||||
|
||||
// Logging initialization
|
||||
console.log('--');
|
||||
console.log(chalk.green('Environment:\t\t\t' + process.env.NODE_ENV));
|
||||
|
@ -81,8 +77,12 @@ var bootstrap = module.exports.bootstrap = function() {
|
|||
console.error(err.stack);
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
return app;
|
||||
}
|
||||
|
||||
module.exports = bootstrap();
|
||||
|
||||
// To maintain backwards compatibility, run bootstrap when called as a file
|
||||
if(require.main === module) {
|
||||
bootstrap();
|
||||
|
|
7
start.js
7
start.js
|
@ -1,6 +1,5 @@
|
|||
var fs = require('fs'),
|
||||
setup = require('./scripts/setup'),
|
||||
server = require('./server');
|
||||
setup = require('./scripts/setup');
|
||||
|
||||
//Set this to infinity to increase server capacity
|
||||
require('events').EventEmitter.prototype._maxListeners = 0;
|
||||
|
@ -9,8 +8,8 @@ require('events').EventEmitter.prototype._maxListeners = 0;
|
|||
//Run setup script if no .env file is detected
|
||||
if(process.stdout.isTTY) {
|
||||
setup.checkENVAndRunSetup(function() {
|
||||
server.bootstrap();
|
||||
require('./server');
|
||||
});
|
||||
} else {
|
||||
server.bootstrap();
|
||||
require('./server');
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue