mirror of
				https://github.com/Unleash/unleash.git
				synced 2025-10-27 11:02:16 +01:00 
			
		
		
		
	Split app and server. No need to start the server for these tests.
This commit is contained in:
		
							parent
							
								
									0047d52ef4
								
							
						
					
					
						commit
						2f0cddd45b
					
				
							
								
								
									
										46
									
								
								app.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								app.js
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,46 @@ | |||||||
|  | var express     = require('express'), | ||||||
|  |     bodyParser  = require('body-parser'), | ||||||
|  |     log4js      = require('log4js'), | ||||||
|  |     logger      = require('./lib/logger'), | ||||||
|  |     routes      = require('./lib/routes'), | ||||||
|  |     eventApi    = require('./lib/eventApi'), | ||||||
|  |     featureApi  = require('./lib/featureApi'), | ||||||
|  |     strategyApi = require('./lib/strategyApi'), | ||||||
|  |     validator   = require('express-validator'), | ||||||
|  |     app         = express(), | ||||||
|  |     router      = express.Router(), | ||||||
|  |     baseUriPath = process.env.BASE_URI_PATH || ''; | ||||||
|  | 
 | ||||||
|  | if(app.get('env') === 'development') { | ||||||
|  |     app.use(require('errorhandler')()); | ||||||
|  | 
 | ||||||
|  |     var webpack              = require('webpack'), | ||||||
|  |         webpackDevMiddleware = require('webpack-dev-middleware'), | ||||||
|  |         webpackConfig        = require('./webpack.config'), | ||||||
|  |         compiler             = webpack(webpackConfig), | ||||||
|  |         config               = { | ||||||
|  |             publicPath: '/js', | ||||||
|  |             noInfo: true | ||||||
|  |         }; | ||||||
|  | 
 | ||||||
|  |     app.use(baseUriPath, webpackDevMiddleware(compiler, config)); | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | app.use(validator([])); | ||||||
|  | 
 | ||||||
|  | app.set('trust proxy'); | ||||||
|  | app.locals.baseUriPath = baseUriPath; | ||||||
|  | 
 | ||||||
|  | app.use(log4js.connectLogger(logger, {format: ':remote-addr :status :method :url :response-timems'})); | ||||||
|  | app.set('port', process.env.HTTP_PORT || process.env.PORT || 4242); | ||||||
|  | 
 | ||||||
|  | app.use(baseUriPath, express.static(__dirname + '/public')); | ||||||
|  | app.use(bodyParser.json({strict: false})); | ||||||
|  | 
 | ||||||
|  | eventApi(router); | ||||||
|  | featureApi(router); | ||||||
|  | strategyApi(router); | ||||||
|  | routes(router); | ||||||
|  | app.use(baseUriPath, router); | ||||||
|  | 
 | ||||||
|  | module.exports = app; | ||||||
							
								
								
									
										47
									
								
								server.js
									
									
									
									
									
								
							
							
						
						
									
										47
									
								
								server.js
									
									
									
									
									
								
							| @ -1,47 +1,5 @@ | |||||||
| var express     = require('express'), | var app    = require('./app'); | ||||||
|     bodyParser  = require('body-parser'), | var logger = require('./lib/logger'); | ||||||
|     log4js      = require('log4js'), |  | ||||||
|     logger      = require('./lib/logger'), |  | ||||||
|     routes      = require('./lib/routes'), |  | ||||||
|     eventApi    = require('./lib/eventApi'), |  | ||||||
|     featureApi  = require('./lib/featureApi'), |  | ||||||
|     strategyApi  = require('./lib/strategyApi'), |  | ||||||
|     validator   = require('express-validator'), |  | ||||||
|     app         = express(), |  | ||||||
|     router      = express.Router(), |  | ||||||
|     baseUriPath = process.env.BASE_URI_PATH || ''; |  | ||||||
| 
 |  | ||||||
| if(app.get('env') === 'development') { |  | ||||||
|     app.use(require('errorhandler')()); |  | ||||||
| 
 |  | ||||||
|     var webpack              = require('webpack'), |  | ||||||
|         webpackDevMiddleware = require('webpack-dev-middleware'), |  | ||||||
|         webpackConfig        = require('./webpack.config'), |  | ||||||
|         compiler             = webpack(webpackConfig), |  | ||||||
|         config               = { |  | ||||||
|             publicPath: '/js', |  | ||||||
|             noInfo: true |  | ||||||
|         }; |  | ||||||
| 
 |  | ||||||
|     app.use(baseUriPath, webpackDevMiddleware(compiler, config)); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| app.use(validator([])); |  | ||||||
| 
 |  | ||||||
| app.set('trust proxy'); |  | ||||||
| app.locals.baseUriPath = baseUriPath; |  | ||||||
| 
 |  | ||||||
| app.use(log4js.connectLogger(logger, {format: ':remote-addr :status :method :url :response-timems'})); |  | ||||||
| app.set('port', process.env.HTTP_PORT || process.env.PORT || 4242); |  | ||||||
| 
 |  | ||||||
| app.use(baseUriPath, express.static(__dirname + '/public')); |  | ||||||
| app.use(bodyParser.json({strict: false})); |  | ||||||
| 
 |  | ||||||
| eventApi(router); |  | ||||||
| featureApi(router); |  | ||||||
| strategyApi(router); |  | ||||||
| routes(router); |  | ||||||
| app.use(baseUriPath, router); |  | ||||||
| 
 | 
 | ||||||
| var server = app.listen(app.get('port'), function() { | var server = app.listen(app.get('port'), function() { | ||||||
|     logger.info('unleash started on ' + app.get('port')); |     logger.info('unleash started on ' + app.get('port')); | ||||||
| @ -52,7 +10,6 @@ process.on('uncaughtException', function(err) { | |||||||
|     logger.error(err.stack); |     logger.error(err.stack); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| module.exports = { | module.exports = { | ||||||
|     app: app, |     app: app, | ||||||
|     server: server |     server: server | ||||||
|  | |||||||
| @ -1,6 +1,8 @@ | |||||||
| var request = require('supertest'); | var request = require('supertest'); | ||||||
| var mockery = require('mockery'); | var mockery = require('mockery'); | ||||||
| 
 | 
 | ||||||
|  | process.env.NODE_ENV = 'test'; | ||||||
|  | 
 | ||||||
| var server; | var server; | ||||||
| 
 | 
 | ||||||
| function setupMockServer() { | function setupMockServer() { | ||||||
| @ -14,9 +16,9 @@ function setupMockServer() { | |||||||
|     mockery.registerSubstitute('./featureDb', '../test/featureDbMock'); |     mockery.registerSubstitute('./featureDb', '../test/featureDbMock'); | ||||||
|     mockery.registerSubstitute('./strategyDb', '../test/strategyDbMock'); |     mockery.registerSubstitute('./strategyDb', '../test/strategyDbMock'); | ||||||
| 
 | 
 | ||||||
|     server = require('../server'); |     var app = require('../app'); | ||||||
| 
 | 
 | ||||||
|     return request('http://localhost:' + server.app.get('port')); |     return request(app); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function tearDownMockServer() { | function tearDownMockServer() { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user