Refactors configuration management (#4271)
* Adds flow types / Configuration interfaces * Lets call it options * Use a single interface to generate the configurations * Translates options to definitions only if comments are set * improves logic * Moves objects around * Fixes issue affecting logging of circular objects * fixes undefined env * Moves all defaults to defaults * Adds back CLI defaults * Restored defaults in commander.js * Merge provided defaults and platform defaults * Addresses visual nits * Improves Config.js code * Adds ability to pass the default value in trailing comments * Load platform defaults from the definitions file * proper default values on various options * Adds ParseServer.start and server.start(options) as quick startup methods * Moves creating liveQueryServer http into ParseServer.js * removes dead code * Adds tests to guarantee we can start a LQ Server from main module * Fixes incorrect code regading liveQuery init port * Start a http server for LQ if port is specified * ensure we dont fail if config.port is not set * Specify port * ignore other path skipped in tests * Adds test for custom middleware setting * Refactors new Config into Config.get - Hides AppCache from ParseServer.js, use Config.put which validates * Extracts controller creation into Controllers/index.js - This makes the ParseServer init way simpler * Move serverURL inference into ParseServer * review nits
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
var Parse = require('parse/node');
|
||||
var ParseLiveQueryServer = require('../src/LiveQuery/ParseLiveQueryServer').ParseLiveQueryServer;
|
||||
var ParseServer = require('../src/ParseServer').default;
|
||||
|
||||
// Global mock info
|
||||
var queryHashValue = 'hash';
|
||||
@@ -86,6 +87,66 @@ describe('ParseLiveQueryServer', function() {
|
||||
expect(parseLiveQueryServer.subscriptions.size).toBe(0);
|
||||
});
|
||||
|
||||
it('can be initialized from ParseServer', function() {
|
||||
var httpServer = {};
|
||||
var parseLiveQueryServer = ParseServer.createLiveQueryServer(httpServer, {});
|
||||
|
||||
expect(parseLiveQueryServer.clientId).toBeUndefined();
|
||||
expect(parseLiveQueryServer.clients.size).toBe(0);
|
||||
expect(parseLiveQueryServer.subscriptions.size).toBe(0);
|
||||
});
|
||||
|
||||
it('can be initialized from ParseServer without httpServer', function(done) {
|
||||
var parseLiveQueryServer = ParseServer.createLiveQueryServer(undefined, {
|
||||
port: 22345
|
||||
});
|
||||
|
||||
expect(parseLiveQueryServer.clientId).toBeUndefined();
|
||||
expect(parseLiveQueryServer.clients.size).toBe(0);
|
||||
expect(parseLiveQueryServer.subscriptions.size).toBe(0);
|
||||
parseLiveQueryServer.server.close(done);
|
||||
});
|
||||
|
||||
it('can be initialized through ParseServer without liveQueryServerOptions', function(done) {
|
||||
var parseServer = ParseServer.start({
|
||||
appId: 'hello',
|
||||
masterKey: 'world',
|
||||
port: 22345,
|
||||
mountPath: '/1',
|
||||
serverURL: 'http://localhost:12345/1',
|
||||
liveQuery: {
|
||||
classNames: ['Yolo']
|
||||
},
|
||||
startLiveQueryServer: true
|
||||
});
|
||||
|
||||
expect(parseServer.liveQueryServer).not.toBeUndefined();
|
||||
expect(parseServer.liveQueryServer.server).toBe(parseServer.server);
|
||||
parseServer.server.close(done);
|
||||
});
|
||||
|
||||
it('can be initialized through ParseServer with liveQueryServerOptions', function(done) {
|
||||
var parseServer = ParseServer.start({
|
||||
appId: 'hello',
|
||||
masterKey: 'world',
|
||||
port: 22346,
|
||||
mountPath: '/1',
|
||||
serverURL: 'http://localhost:12345/1',
|
||||
liveQuery: {
|
||||
classNames: ['Yolo']
|
||||
},
|
||||
liveQueryServerOptions: {
|
||||
port: 22347,
|
||||
}
|
||||
});
|
||||
|
||||
expect(parseServer.liveQueryServer).not.toBeUndefined();
|
||||
expect(parseServer.liveQueryServer.server).not.toBe(parseServer.server);
|
||||
parseServer.liveQueryServer.server.close();
|
||||
parseServer.server.close(done);
|
||||
});
|
||||
|
||||
|
||||
it('can handle connect command', function() {
|
||||
var parseLiveQueryServer = new ParseLiveQueryServer(10, 10, {});
|
||||
var parseWebSocket = {
|
||||
|
||||
Reference in New Issue
Block a user