diff --git a/browser.js b/browser.js
index 0e26a5c..97aff07 100644
--- a/browser.js
+++ b/browser.js
@@ -21,7 +21,7 @@ var Bootstrapper = require('./lib/bootstrapper').Bootstrapper;
* @header boot(app)
*/
-exports = module.exports = function bootBrowserApp(app, options) {
+exports = module.exports = function bootBrowserApp(app, options, callback) {
// Only using options.id to identify the browserified bundle to load for
// this application. If no Id was provided, load the default bundle.
var moduleName = 'loopback-boot#instructions';
@@ -39,6 +39,6 @@ exports = module.exports = function bootBrowserApp(app, options) {
app: app,
instructions: instructions,
};
- bootstrapper.run(context);
+ return bootstrapper.run(context, callback);
};
diff --git a/index.js b/index.js
index 65ffc37..f079004 100644
--- a/index.js
+++ b/index.js
@@ -146,6 +146,11 @@ var utils = require('./lib/utils');
*/
exports = module.exports = function bootLoopBackApp(app, options, callback) {
+ if (typeof options === 'function' && callback === undefined) {
+ callback = options;
+ options = {};
+ }
+ options = options || {};
// backwards compatibility with loopback's app.boot
options.env = options.env || app.get('env');
@@ -156,17 +161,14 @@ exports = module.exports = function bootLoopBackApp(app, options, callback) {
app: app,
};
- bootstrapper.run(context, callback);
+ return bootstrapper.run(context, callback);
};
-exports.compile = function(options) {
+exports.compile = function(options, done) {
var bootstrapper = new Bootstrapper(options);
bootstrapper.phases = ['load', 'compile'];
var context = {};
- bootstrapper.run(context, function(err) {
- if (err) throw err;
- });
- return context.instructions;
+ return bootstrapper.run(context, done);
};
/**
@@ -179,9 +181,13 @@ exports.compile = function(options) {
*
* @header boot.compileToBrowserify(options, bundler)
*/
-exports.compileToBrowserify = function(options, bundler) {
- var instructions = exports.compile(options);
- addInstructionsToBrowserify({ instructions: instructions }, bundler);
+exports.compileToBrowserify = function(options, bundler, done) {
+ return exports.compile(options, function(err, context) {
+ if (err) return done(err);
+ addInstructionsToBrowserify({ instructions: context.instructions },
+ bundler);
+ done();
+ });
};
/* -- undocumented low-level API -- */
@@ -202,9 +208,5 @@ exports.execute = function(app, instructions, done) {
app: app,
instructions: instructions,
};
- bootstrapper.run(context, function(err) {
- if (err) throw err;
- if (done) done(err);
- });
- return context;
+ return bootstrapper.run(context, done);
};
diff --git a/lib/bootstrapper.js b/lib/bootstrapper.js
index 6c61859..7029476 100644
--- a/lib/bootstrapper.js
+++ b/lib/bootstrapper.js
@@ -144,42 +144,40 @@ Bootstrapper.prototype.run = function(context, done) {
var phases = context.phases || this.phases;
var bootPlugins = this.getExtensions('/boot');
- async.eachSeries(phases, function(phase, done) {
+ async.eachSeries(phases, function(phase, cb1) {
debug('Phase %s', phase);
- async.eachSeries(bootPlugins, function(plugin, done) {
+ async.eachSeries(bootPlugins, function(plugin, cb2) {
var result;
if (typeof plugin.handler[phase] === 'function') {
debug('Invoking %s.%s', plugin.handler.name, phase);
try {
if (plugin.handler[phase].length === 2) {
- plugin.handler[phase](context, done);
+ plugin.handler[phase](context, cb2);
} else {
result = plugin.handler[phase](context);
if (typeof Promise !== 'undefined') {
- if (result && typeof result.then === 'function') {
- result.then(function(value) {
- done(null, value);
- }).catch(function(err) {
- debug(err);
- done(err);
- });
- } else {
- done(null, result);
- }
+ Promise.resolve(result).then(function(value) {
+ cb2(null, value);
+ }).catch(function(err) {
+ debug(err);
+ cb2(err);
+ });
} else {
- done(null, result);
+ cb2(null, result);
}
}
} catch (err) {
debug(err);
- done(err);
+ cb2(err);
}
} else {
debug('Skipping %s.%s', plugin.handler.name, phase);
- return done();
+ return cb2();
}
- }, done);
- }, done);
+ }, cb1);
+ }, function(err) {
+ return done(err, context);
+ });
return done.promise;
};
diff --git a/lib/plugins/boot-script.js b/lib/plugins/boot-script.js
index 878c8b3..90406ab 100644
--- a/lib/plugins/boot-script.js
+++ b/lib/plugins/boot-script.js
@@ -77,9 +77,14 @@ function runScripts(app, list, callback) {
});
} else {
debug('Starting sync function %s', f.path);
- f.func(app);
- debug('Sync function finished %s', f.path);
- done();
+ var error;
+ try {
+ f.func(app);
+ debug('Sync function finished %s', f.path);
+ } catch (err) {
+ error = err;
+ }
+ done(error);
}
}, callback);
}
diff --git a/test/browser.multiapp.test.js b/test/browser.multiapp.test.js
index 3b78aea..5beb96e 100644
--- a/test/browser.multiapp.test.js
+++ b/test/browser.multiapp.test.js
@@ -4,6 +4,7 @@
// License text available at https://opensource.org/licenses/MIT
var boot = require('../');
+var async = require('async');
var exportBrowserifyToFile = require('./helpers/browserify').exportToSandbox;
var fs = require('fs');
var path = require('path');
@@ -40,20 +41,21 @@ describe('browser support for multiple apps', function() {
browserifyTestApps(apps, function(err, bundlePath) {
if (err) return done(err);
- var bundledApps = executeBundledApps(bundlePath, apps);
- var app1 = bundledApps.defaultApp;
- var app2 = bundledApps.browserApp2;
+ var bundledApps = executeBundledApps(bundlePath, apps, function(err) {
+ var app1 = bundledApps.defaultApp;
+ var app2 = bundledApps.browserApp2;
- expect(app1.settings).to.have.property('custom-key', 'custom-value');
- expect(Object.keys(app1.models)).to.include('Customer');
- expect(Object.keys(app1.models)).to.not.include('Robot');
- expect(app1.models.Customer.settings).to.have.property('_customized',
- 'Customer');
+ expect(app1.settings).to.have.property('custom-key', 'custom-value');
+ expect(Object.keys(app1.models)).to.include('Customer');
+ expect(Object.keys(app1.models)).to.not.include('Robot');
+ expect(app1.models.Customer.settings).to.have.property('_customized',
+ 'Customer');
- expect(Object.keys(app2.models)).to.include('Robot');
- expect(Object.keys(app2.models)).to.not.include('Customer');
+ expect(Object.keys(app2.models)).to.include('Robot');
+ expect(Object.keys(app2.models)).to.not.include('Customer');
- done();
+ done();
+ });
});
});
});
@@ -74,6 +76,7 @@ function browserifyTestApps(apps, next) {
addPlugins(b);
+ var bundles = [];
for (var i in apps) {
var appDir = apps[i].appDir;
var appFile = apps[i].appFile;
@@ -90,28 +93,37 @@ function browserifyTestApps(apps, next) {
appRootDir: appDir,
};
}
- boot.compileToBrowserify(opts, b);
+ bundles.push(opts);
}
-
- exportBrowserifyToFile(b, 'browser-app-bundle.js', next);
+ async.eachSeries(bundles, function(opts, done) {
+ boot.compileToBrowserify(opts, b, done);
+ }, function(err) {
+ exportBrowserifyToFile(b, 'browser-app-bundle.js', next);
+ });
}
-function executeBundledApps(bundlePath, apps) {
+function executeBundledApps(bundlePath, apps, done) {
var code = fs.readFileSync(bundlePath);
var context = createBrowserLikeContext();
vm.runInContext(code, context, bundlePath);
+ var ids = [];
var script = 'var apps = {};\n';
for (var i in apps) {
var moduleName = apps[i].moduleName;
var id = apps[i].appId || 'defaultApp';
+ ids.push(id);
script += 'apps.' + id + ' = require("' + moduleName + '");\n';
}
script += 'apps;\n';
var appsInContext = vm.runInContext(script, context);
-
- printContextLogs(context);
+ async.each(ids, function(id, done) {
+ appsInContext[id].start(done);
+ }, function(err) {
+ printContextLogs(context);
+ done();
+ });
return appsInContext;
}
diff --git a/test/browser.test.js b/test/browser.test.js
index b1a64bf..7857730 100644
--- a/test/browser.test.js
+++ b/test/browser.test.js
@@ -58,19 +58,18 @@ describe('browser support', function() {
browserifyTestApp(appDir, function(err, bundlePath) {
if (err) return done(err);
- var app = executeBundledApp(bundlePath);
+ var app = executeBundledApp(bundlePath, function(err) {
+ // configured in fixtures/browser-app/boot/configure.js
+ expect(app.settings).to.have.property('custom-key', 'custom-value');
+ expect(Object.keys(app.models)).to.include('Customer');
+ expect(app.models.Customer.settings)
+ .to.have.property('_customized', 'Customer');
- // configured in fixtures/browser-app/boot/configure.js
- expect(app.settings).to.have.property('custom-key', 'custom-value');
- expect(Object.keys(app.models)).to.include('Customer');
- expect(app.models.Customer.settings)
- .to.have.property('_customized', 'Customer');
-
- // configured in fixtures/browser-app/component-config.json
- // and fixtures/browser-app/components/dummy-component.js
- expect(app.dummyComponentOptions).to.eql({ option: 'value' });
-
- done();
+ // configured in fixtures/browser-app/component-config.json
+ // and fixtures/browser-app/components/dummy-component.js
+ expect(app.dummyComponentOptions).to.eql({ option: 'value' });
+ done();
+ });
});
});
@@ -83,14 +82,14 @@ describe('browser support', function() {
browserifyTestApp(options, function(err, bundlePath) {
if (err) return done(err);
- var app = executeBundledApp(bundlePath);
+ var app = executeBundledApp(bundlePath, function(err) {
+ var modelBuilder = app.registry.modelBuilder;
+ var registry = modelBuilder.mixins.mixins;
+ expect(Object.keys(registry)).to.eql(['TimeStamps']);
+ expect(app.models.Customer.timeStampsMixin).to.eql(true);
- var modelBuilder = app.registry.modelBuilder;
- var registry = modelBuilder.mixins.mixins;
- expect(Object.keys(registry)).to.eql(['TimeStamps']);
- expect(app.models.Customer.timeStampsMixin).to.eql(true);
-
- done();
+ done();
+ });
});
});
@@ -103,14 +102,14 @@ describe('browser support', function() {
browserifyTestApp(appDir, 'coffee', function(err, bundlePath) {
if (err) return done(err);
- var app = executeBundledApp(bundlePath);
-
- // configured in fixtures/browser-app/boot/configure.coffee
- expect(app.settings).to.have.property('custom-key', 'custom-value');
- expect(Object.keys(app.models)).to.include('Customer');
- expect(app.models.Customer.settings)
- .to.have.property('_customized', 'Customer');
- done();
+ var app = executeBundledApp(bundlePath, function(err) {
+ // configured in fixtures/browser-app/boot/configure.coffee
+ expect(app.settings).to.have.property('custom-key', 'custom-value');
+ expect(Object.keys(app.models)).to.include('Customer');
+ expect(app.models.Customer.settings)
+ .to.have.property('_customized', 'Customer');
+ done();
+ });
});
});
});
@@ -127,18 +126,19 @@ function browserifyTestApp(options, strategy, next) {
var appDir = typeof(options) === 'object' ? options.appRootDir : options;
var b = compileStrategies[strategy](appDir);
- boot.compileToBrowserify(options, b);
-
- exportBrowserifyToFile(b, 'browser-app-bundle.js', next);
+ boot.compileToBrowserify(options, b, function(err) {
+ exportBrowserifyToFile(b, 'browser-app-bundle.js', next);
+ });
}
-function executeBundledApp(bundlePath) {
+function executeBundledApp(bundlePath, done) {
var code = fs.readFileSync(bundlePath);
var context = createBrowserLikeContext();
vm.runInContext(code, context, bundlePath);
var app = vm.runInContext('require("browser-app")', context);
-
- printContextLogs(context);
-
+ app.start(function(err) {
+ printContextLogs(context);
+ done(err);
+ });
return app;
}
diff --git a/test/compiler.test.js b/test/compiler.test.js
index 668e5ab..9241c61 100644
--- a/test/compiler.test.js
+++ b/test/compiler.test.js
@@ -19,10 +19,28 @@ describe('compiler', function() {
beforeEach(sandbox.reset);
beforeEach(appdir.init);
+ function expectToThrow(err, done, options) {
+ boot.compile(options || appdir.PATH, function(err) {
+ expect(function() {
+ if (err) throw err;
+ }).to.throw(err);
+ done();
+ });
+ }
+
+ function expectToNotThrow(done, options) {
+ boot.compile(options || appdir.PATH, function(err) {
+ expect(function() {
+ if (err) throw err;
+ }).to.not.throw();
+ done();
+ });
+ }
+
describe('from options', function() {
var options, instructions, appConfig;
- beforeEach(function() {
+ beforeEach(function(done) {
options = {
application: {
port: 3000,
@@ -43,8 +61,12 @@ describe('compiler', function() {
},
},
};
- instructions = boot.compile(options);
- appConfig = instructions.application;
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ appConfig = context.instructions.application;
+ instructions = context.instructions;
+ done();
+ });
});
it('has port setting', function() {
@@ -82,12 +104,12 @@ describe('compiler', function() {
expect(instructions.dataSources).to.eql(options.dataSources);
});
- describe('with custom model definitions', function() {
+ describe('with custom model definitions', function(done) {
var dataSources = {
'the-db': { connector: 'memory' },
};
- it('loads model without definition', function() {
+ it('loads model without definition', function(done) {
var instruction = boot.compile({
appRootDir: appdir.PATH,
models: {
@@ -97,17 +119,21 @@ describe('compiler', function() {
},
modelDefinitions: [],
dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name)
+ .to.equal('model-without-definition');
+ expect(instructions.models[0].definition).to.equal(undefined);
+ expect(instructions.models[0].sourceFile).to.equal(undefined);
+ done();
});
- expect(instruction.models[0].name)
- .to.equal('model-without-definition');
- expect(instruction.models[0].definition).to.equal(undefined);
- expect(instruction.models[0].sourceFile).to.equal(undefined);
});
- it('loads coffeescript models', function() {
+ it('loads coffeescript models', function(done) {
var modelScript = appdir.writeFileSync(
'custom-models/coffee-model-with-definition.coffee', '');
- var instruction = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
models: {
'coffee-model-with-definition': {
@@ -123,20 +149,24 @@ describe('compiler', function() {
},
],
dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name)
+ .to.equal('coffee-model-with-definition');
+ expect(instructions.models[0].definition).to.eql({
+ name: 'coffee-model-with-definition',
+ });
+ expect(instructions.models[0].sourceFile).to.equal(modelScript);
+ done();
});
- expect(instruction.models[0].name)
- .to.equal('coffee-model-with-definition');
- expect(instruction.models[0].definition).to.eql({
- name: 'coffee-model-with-definition',
- });
- expect(instruction.models[0].sourceFile).to.equal(modelScript);
});
- it('handles sourceFile path without extension (.js)', function() {
+ it('handles sourceFile path without extension (.js)', function(done) {
var modelScript = appdir.writeFileSync(
'custom-models/model-without-ext.coffee',
'');
- var instruction = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
models: {
'model-without-ext': {
@@ -150,16 +180,20 @@ describe('compiler', function() {
sourceFile: pathWithoutExtension(modelScript),
}],
dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name).to.equal('model-without-ext');
+ expect(instructions.models[0].sourceFile).to.equal(modelScript);
+ done();
});
- expect(instruction.models[0].name).to.equal('model-without-ext');
- expect(instruction.models[0].sourceFile).to.equal(modelScript);
});
- it('handles sourceFile path without extension (.coffee)', function() {
+ it('handles sourceFile path without extension (.coffee)', function(done) {
var modelScript = appdir.writeFileSync(
'custom-models/model-without-ext.coffee',
'');
- var instruction = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
models: {
'model-without-ext': {
@@ -173,16 +207,20 @@ describe('compiler', function() {
sourceFile: pathWithoutExtension(modelScript),
}],
dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name).to.equal('model-without-ext');
+ expect(instructions.models[0].sourceFile).to.equal(modelScript);
+ done();
});
- expect(instruction.models[0].name).to.equal('model-without-ext');
- expect(instruction.models[0].sourceFile).to.equal(modelScript);
});
- it('sets source file path if the file exist', function() {
+ it('sets source file path if the file exist', function(done) {
var modelScript = appdir.writeFileSync(
'custom-models/model-with-definition.js',
'');
- var instruction = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
models: {
'model-with-definition': {
@@ -198,65 +236,77 @@ describe('compiler', function() {
},
],
dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name).to.equal('model-with-definition');
+ expect(instructions.models[0].definition).not.to.equal(undefined);
+ expect(instructions.models[0].sourceFile).to.equal(modelScript);
+ done();
});
- expect(instruction.models[0].name).to.equal('model-with-definition');
- expect(instruction.models[0].definition).not.to.equal(undefined);
- expect(instruction.models[0].sourceFile).to.equal(modelScript);
});
it('does not set source file path if the file does not exist.',
- function() {
- var instruction = boot.compile({
- appRootDir: appdir.PATH,
- models: {
- 'model-with-definition-with-falsey-source-file': {
- dataSource: 'the-db',
- },
- },
- modelDefinitions: [
- {
- definition: {
- name: 'model-with-definition-with-falsey-source-file',
+ function(done) {
+ boot.compile({
+ appRootDir: appdir.PATH,
+ models: {
+ 'model-with-definition-with-falsey-source-file': {
+ dataSource: 'the-db',
},
- sourceFile: appdir.resolve('custom-models',
- 'file-does-not-exist.js'),
},
- ],
- dataSources: dataSources,
+ modelDefinitions: [
+ {
+ definition: {
+ name: 'model-with-definition-with-falsey-source-file',
+ },
+ sourceFile: appdir.resolve('custom-models',
+ 'file-does-not-exist.js'),
+ },
+ ],
+ dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name)
+ .to.equal('model-with-definition-with-falsey-source-file');
+ expect(instructions.models[0].definition).not.to.equal(undefined);
+ expect(instructions.models[0].sourceFile).to.equal(undefined);
+ done();
+ });
});
- expect(instruction.models[0].name)
- .to.equal('model-with-definition-with-falsey-source-file');
- expect(instruction.models[0].definition).not.to.equal(undefined);
- expect(instruction.models[0].sourceFile).to.equal(undefined);
- });
it('does not set source file path if no source file supplied.',
- function() {
- var instruction = boot.compile({
- appRootDir: appdir.PATH,
- models: {
- 'model-with-definition-without-source-file-property': {
- dataSource: 'the-db',
- },
- },
- modelDefinitions: [
- {
- definition: {
- name: 'model-with-definition-without-source-file-property',
+ function(done) {
+ boot.compile({
+ appRootDir: appdir.PATH,
+ models: {
+ 'model-with-definition-without-source-file-property': {
+ dataSource: 'the-db',
},
- // sourceFile is not set
},
- ],
- dataSources: dataSources,
+ modelDefinitions: [
+ {
+ definition: {
+ name: 'model-with-definition-without-source-file-property',
+ },
+ // sourceFile is not set
+ },
+ ],
+ dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models[0].name)
+ .to.equal('model-with-definition-without-source-file-property');
+ expect(instructions.models[0].definition).not.to.equal(undefined);
+ expect(instructions.models[0].sourceFile).to.equal(undefined);
+ done();
+ });
});
- expect(instruction.models[0].name)
- .to.equal('model-with-definition-without-source-file-property');
- expect(instruction.models[0].definition).not.to.equal(undefined);
- expect(instruction.models[0].sourceFile).to.equal(undefined);
- });
- it('loads models defined in `models` only.', function() {
- var instruction = boot.compile({
+ it('loads models defined in `models` only.', function(done) {
+ boot.compile({
appRootDir: appdir.PATH,
models: {
'some-model': {
@@ -276,30 +326,37 @@ describe('compiler', function() {
},
],
dataSources: dataSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.models.map(getNameProperty))
+ .to.eql(['some-model']);
+ done();
});
-
- expect(instruction.models.map(getNameProperty))
- .to.eql(['some-model']);
});
});
});
- describe('from directory', function() {
- it('loads config files', function() {
- var instructions = boot.compile(SIMPLE_APP);
+ describe('from directory', function(done) {
+ it('loads config files', function(done) {
+ boot.compile(SIMPLE_APP, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.eql({
- name: 'User',
- config: {
- dataSource: 'db',
- },
- definition: undefined,
- sourceFile: undefined,
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.eql({
+ name: 'User',
+ config: {
+ dataSource: 'db',
+ },
+ definition: undefined,
+ sourceFile: undefined,
+ });
+ done();
});
});
- it('merges datasource configs from multiple files', function() {
+ it('merges datasource configs from multiple files', function(done) {
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('datasources.local.json', {
db: { local: 'applied' },
@@ -310,46 +367,58 @@ describe('compiler', function() {
db: { env: 'applied' },
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var db = instructions.dataSources.db;
- expect(db).to.have.property('local', 'applied');
- expect(db).to.have.property('env', 'applied');
+ var db = instructions.dataSources.db;
+ expect(db).to.have.property('local', 'applied');
+ expect(db).to.have.property('env', 'applied');
- var expectedLoadOrder = ['local', 'env'];
- var actualLoadOrder = Object.keys(db).filter(function(k) {
- return expectedLoadOrder.indexOf(k) !== -1;
+ var expectedLoadOrder = ['local', 'env'];
+ var actualLoadOrder = Object.keys(db).filter(function(k) {
+ return expectedLoadOrder.indexOf(k) !== -1;
+ });
+
+ expect(actualLoadOrder, 'load order').to.eql(expectedLoadOrder);
+ done();
});
-
- expect(actualLoadOrder, 'load order').to.eql(expectedLoadOrder);
});
- it('supports .js for custom datasource config files', function() {
+ it('supports .js for custom datasource config files', function(done) {
appdir.createConfigFilesSync();
appdir.writeFileSync('datasources.local.js',
'module.exports = { db: { fromJs: true } };');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var db = instructions.dataSources.db;
- expect(db).to.have.property('fromJs', true);
+ var db = instructions.dataSources.db;
+ expect(db).to.have.property('fromJs', true);
+ done();
+ });
});
- it('merges new Object values', function() {
+ it('merges new Object values', function(done) {
var objectValue = { key: 'value' };
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('datasources.local.json', {
db: { nested: objectValue },
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var db = instructions.dataSources.db;
- expect(db).to.have.property('nested');
- expect(db.nested).to.eql(objectValue);
+ var db = instructions.dataSources.db;
+ expect(db).to.have.property('nested');
+ expect(db.nested).to.eql(objectValue);
+ done();
+ });
});
- it('deeply merges Object values', function() {
+ it('deeply merges Object values', function(done) {
appdir.createConfigFilesSync({}, {
email: {
transport: {
@@ -366,12 +435,16 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
- var email = instructions.dataSources.email;
- expect(email.transport.host).to.equal('mail.example.com');
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ var email = instructions.dataSources.email;
+ expect(email.transport.host).to.equal('mail.example.com');
+ done();
+ });
});
- it('deeply merges Array values of the same length', function() {
+ it('deeply merges Array values of the same length', function(done) {
appdir.createConfigFilesSync({}, {
rest: {
operations: [
@@ -397,70 +470,90 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var rest = instructions.dataSources.rest;
- expect(rest.operations[0].template).to.eql({
- method: 'POST', // the value from datasources.json
- url: 'http://api.example.com', // overriden in datasources.local.json
+ var rest = instructions.dataSources.rest;
+ expect(rest.operations[0].template).to.eql({
+ method: 'POST', // the value from datasources.json
+ url: 'http://api.example.com', // overriden in datasources.local.json
+ });
+ done();
});
});
- it('merges Array properties', function() {
+ it('merges Array properties', function(done) {
var arrayValue = ['value'];
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('datasources.local.json', {
db: { nested: arrayValue },
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var db = instructions.dataSources.db;
- expect(db).to.have.property('nested');
- expect(db.nested).to.eql(arrayValue);
+ var db = instructions.dataSources.db;
+ expect(db).to.have.property('nested');
+ expect(db.nested).to.eql(arrayValue);
+ done();
+ });
});
- it('allows env specific model-config json', function() {
+ it('allows env specific model-config json', function(done) {
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('model-config.local.json', {
foo: { dataSource: 'db' },
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.have.property('name', 'foo');
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.have.property('name', 'foo');
+ done();
+ });
});
- it('allows env specific model-config json to be merged', function() {
+ it('allows env specific model-config json to be merged', function(done) {
appdir.createConfigFilesSync(null, null,
{ foo: { dataSource: 'mongo', public: false }});
appdir.writeConfigFileSync('model-config.local.json', {
foo: { dataSource: 'db' },
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.have.property('name', 'foo');
- expect(instructions.models[0].config).to.eql({
- dataSource: 'db',
- public: false,
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.have.property('name', 'foo');
+ expect(instructions.models[0].config).to.eql({
+ dataSource: 'db',
+ public: false,
+ });
+ done();
});
});
- it('allows env specific model-config js', function() {
+ it('allows env specific model-config js', function(done) {
appdir.createConfigFilesSync();
appdir.writeFileSync('model-config.local.js',
'module.exports = { foo: { dataSource: \'db\' } };');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.have.property('name', 'foo');
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.have.property('name', 'foo');
+ done();
+ });
});
- it('refuses to merge Array properties of different length', function() {
+ it('refuses to merge Array properties of different length', function(done) {
appdir.createConfigFilesSync({
nest: {
array: [],
@@ -477,11 +570,10 @@ describe('compiler', function() {
},
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/array values of different length.*nest\.array/);
+ expectToThrow(/array values of different length.*nest\.array/, done);
});
- it('refuses to merge Array of different length in Array', function() {
+ it('refuses to merge Array of different length in Array', function(done) {
appdir.createConfigFilesSync({
key: [[]],
});
@@ -490,11 +582,10 @@ describe('compiler', function() {
key: [['value']],
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/array values of different length.*key\[0\]/);
+ expectToThrow(/array values of different length.*key\[0\]/, done);
});
- it('returns full key of an incorrect Array value', function() {
+ it('returns full key of an incorrect Array value', function(done) {
appdir.createConfigFilesSync({
toplevel: [
{
@@ -511,11 +602,11 @@ describe('compiler', function() {
],
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/array values of different length.*toplevel\[0\]\.nested/);
+ expectToThrow(/array values of different length.*toplevel\[0\]\.nested/,
+ done);
});
- it('refuses to merge incompatible object properties', function() {
+ it('refuses to merge incompatible object properties', function(done) {
appdir.createConfigFilesSync({
key: [],
});
@@ -523,11 +614,10 @@ describe('compiler', function() {
key: {},
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/incompatible types.*key/);
+ expectToThrow(/incompatible types.*key/, done);
});
- it('refuses to merge incompatible array items', function() {
+ it('refuses to merge incompatible array items', function(done) {
appdir.createConfigFilesSync({
key: [[]],
});
@@ -535,11 +625,10 @@ describe('compiler', function() {
key: [{}],
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/incompatible types.*key\[0\]/);
+ expectToThrow(/incompatible types.*key\[0\]/, done);
});
- it('merges app configs from multiple files', function() {
+ it('merges app configs from multiple files', function(done) {
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('config.local.json', { cfgLocal: 'applied' });
@@ -548,32 +637,40 @@ describe('compiler', function() {
appdir.writeConfigFileSync('config.' + env + '.json',
{ cfgEnv: 'applied' });
- var instructions = boot.compile(appdir.PATH);
- var appConfig = instructions.application;
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ var appConfig = instructions.application;
- expect(appConfig).to.have.property('cfgLocal', 'applied');
- expect(appConfig).to.have.property('cfgEnv', 'applied');
+ expect(appConfig).to.have.property('cfgLocal', 'applied');
+ expect(appConfig).to.have.property('cfgEnv', 'applied');
- var expectedLoadOrder = ['cfgLocal', 'cfgEnv'];
- var actualLoadOrder = Object.keys(appConfig).filter(function(k) {
- return expectedLoadOrder.indexOf(k) !== -1;
+ var expectedLoadOrder = ['cfgLocal', 'cfgEnv'];
+ var actualLoadOrder = Object.keys(appConfig).filter(function(k) {
+ return expectedLoadOrder.indexOf(k) !== -1;
+ });
+
+ expect(actualLoadOrder, 'load order').to.eql(expectedLoadOrder);
+ done();
});
-
- expect(actualLoadOrder, 'load order').to.eql(expectedLoadOrder);
});
- it('supports .js for custom app config files', function() {
+ it('supports .js for custom app config files', function(done) {
appdir.createConfigFilesSync();
appdir.writeFileSync('config.local.js',
'module.exports = { fromJs: true };');
- var instructions = boot.compile(appdir.PATH);
- var appConfig = instructions.application;
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ var appConfig = instructions.application;
- expect(appConfig).to.have.property('fromJs', true);
+ expect(appConfig).to.have.property('fromJs', true);
+ done();
+ });
});
- it('supports `appConfigRootDir` option', function() {
+ it('supports `appConfigRootDir` option', function(done) {
appdir.createConfigFilesSync({ port: 3000 });
var customDir = path.resolve(appdir.PATH, 'custom');
@@ -582,15 +679,19 @@ describe('compiler', function() {
path.resolve(appdir.PATH, 'config.json'),
path.resolve(customDir, 'config.json'));
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
appConfigRootDir: path.resolve(appdir.PATH, 'custom'),
- });
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.application).to.have.property('port');
+ expect(instructions.application).to.have.property('port');
+ done();
+ });
});
- it('supports `dsRootDir` option', function() {
+ it('supports `dsRootDir` option', function(done) {
appdir.createConfigFilesSync();
var customDir = path.resolve(appdir.PATH, 'custom');
@@ -599,291 +700,377 @@ describe('compiler', function() {
path.resolve(appdir.PATH, 'datasources.json'),
path.resolve(customDir, 'datasources.json'));
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
dsRootDir: path.resolve(appdir.PATH, 'custom'),
- });
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.dataSources).to.have.property('db');
+ expect(instructions.dataSources).to.have.property('db');
+ done();
+ });
});
- it('supports `modelsRootDir` option', function() {
+ it('supports `modelsRootDir` option', function(done) {
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('custom/model-config.json', {
foo: { dataSource: 'db' },
});
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
modelsRootDir: path.resolve(appdir.PATH, 'custom'),
- });
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.have.property('name', 'foo');
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.have.property('name', 'foo');
+ done();
+ });
});
- it('includes boot/*.js scripts', function() {
+ it('includes boot/*.js scripts', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('boot/init.js',
'module.exports = function(app) { app.fnCalled = true; };');
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.bootScripts).to.eql([initJs]);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
+ });
});
- it('supports `bootDirs` option', function() {
+ it('supports `bootDirs` option', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js',
'module.exports = function(app) { app.fnCalled = true; };');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootDirs: [path.dirname(initJs)],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('should resolve relative path in `bootDirs`', function() {
+ it('should resolve relative path in `bootDirs`', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js',
'module.exports = function(app) { app.fnCalled = true; };');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootDirs: ['./custom-boot'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('should resolve non-relative path in `bootDirs`', function() {
+ it('should resolve non-relative path in `bootDirs`', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootDirs: ['custom-boot'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('ignores index.js in `bootDirs`', function() {
+ it('ignores index.js in `bootDirs`', function(done) {
appdir.createConfigFilesSync();
appdir.writeFileSync('custom-boot/index.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootDirs: ['./custom-boot'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.have.length(0);
+ done();
});
- expect(instructions.bootScripts).to.have.length(0);
});
- it('prefers coffeescript over json in `appRootDir/bootDir`', function() {
- appdir.createConfigFilesSync();
- var coffee = appdir.writeFileSync('./custom-boot/init.coffee', '');
- appdir.writeFileSync('./custom-boot/init.json', {});
+ it('prefers coffeescript over json in `appRootDir/bootDir`',
+ function(done) {
+ appdir.createConfigFilesSync();
+ var coffee = appdir.writeFileSync('./custom-boot/init.coffee', '');
+ appdir.writeFileSync('./custom-boot/init.json', {});
- var instructions = boot.compile({
- appRootDir: appdir.PATH,
- bootDirs: ['./custom-boot'],
+ boot.compile({
+ appRootDir: appdir.PATH,
+ bootDirs: ['./custom-boot'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([coffee]);
+ done();
+ });
});
- expect(instructions.bootScripts).to.eql([coffee]);
- });
it('prefers coffeescript over json in `bootDir` non-relative path',
- function() {
- appdir.createConfigFilesSync();
- var coffee = appdir.writeFileSync('custom-boot/init.coffee',
- '');
- appdir.writeFileSync('custom-boot/init.json', '');
+ function(done) {
+ appdir.createConfigFilesSync();
+ var coffee = appdir.writeFileSync('custom-boot/init.coffee',
+ '');
+ appdir.writeFileSync('custom-boot/init.json', '');
- var instructions = boot.compile({
- appRootDir: appdir.PATH,
- bootDirs: ['custom-boot'],
+ boot.compile({
+ appRootDir: appdir.PATH,
+ bootDirs: ['custom-boot'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([coffee]);
+ done();
+ });
});
- expect(instructions.bootScripts).to.eql([coffee]);
- });
- it('supports `bootScripts` option', function() {
+ it('supports `bootScripts` option', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js',
'module.exports = function(app) { app.fnCalled = true; };');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootScripts: [initJs],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('should remove duplicate scripts', function() {
+ it('should remove duplicate scripts', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js',
'module.exports = function(app) { app.fnCalled = true; };');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootDirs: [path.dirname(initJs)],
bootScripts: [initJs],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('should resolve relative path in `bootScripts`', function() {
+ it('should resolve relative path in `bootScripts`', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js',
'module.exports = function(app) { app.fnCalled = true; };');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootScripts: ['./custom-boot/init.js'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('should resolve non-relative path in `bootScripts`', function() {
+ it('should resolve non-relative path in `bootScripts`', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootScripts: ['custom-boot/init.js'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('resolves missing extensions in `bootScripts`', function() {
+ it('resolves missing extensions in `bootScripts`', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('custom-boot/init.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootScripts: ['./custom-boot/init'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
it('resolves missing extensions in `bootScripts` in module relative path',
- function() {
- appdir.createConfigFilesSync();
- var initJs = appdir.writeFileSync('node_modules/custom-boot/init.js', '');
+ function(done) {
+ appdir.createConfigFilesSync();
+ var initJs = appdir.writeFileSync(
+ 'node_modules/custom-boot/init.js', '');
- var instructions = boot.compile({
- appRootDir: appdir.PATH,
- bootScripts: ['custom-boot/init'],
+ boot.compile({
+ appRootDir: appdir.PATH,
+ bootScripts: ['custom-boot/init'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
+ });
});
- expect(instructions.bootScripts).to.eql([initJs]);
- });
- it('resolves module relative path for `bootScripts`', function() {
+ it('resolves module relative path for `bootScripts`', function(done) {
appdir.createConfigFilesSync();
var initJs = appdir.writeFileSync('node_modules/custom-boot/init.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootScripts: ['custom-boot/init.js'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([initJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([initJs]);
});
- it('explores `bootScripts` in app relative path', function() {
+ it('explores `bootScripts` in app relative path', function(done) {
appdir.createConfigFilesSync();
var appJs = appdir.writeFileSync('./custom-boot/init.js', '');
appdir.writeFileSync('node_modules/custom-boot/init.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
bootScripts: ['custom-boot/init.js'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.bootScripts).to.eql([appJs]);
+ done();
});
- expect(instructions.bootScripts).to.eql([appJs]);
});
- it('ignores models/ subdirectory', function() {
+ it('ignores models/ subdirectory', function(done) {
appdir.createConfigFilesSync();
appdir.writeFileSync('models/my-model.js', '');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.bootScripts).to.not.have.property('models');
+ expect(instructions.bootScripts).to.not.have.property('models');
+ done();
+ });
});
- it('throws when models-config.json contains 1.x `properties`', function() {
- appdir.createConfigFilesSync({}, {}, {
- foo: { properties: { name: 'string' }},
+ it('throws when models-config.json contains 1.x `properties`',
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ foo: { properties: { name: 'string' }},
+ });
+
+ expectToThrow(/unsupported 1\.x format/, done);
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/unsupported 1\.x format/);
- });
+ it('throws when model-config.json contains 1.x `options.base`',
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ Customer: { options: { base: 'User' }},
+ });
- it('throws when model-config.json contains 1.x `options.base`', function() {
- appdir.createConfigFilesSync({}, {}, {
- Customer: { options: { base: 'User' }},
+ expectToThrow(/unsupported 1\.x format/, done);
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/unsupported 1\.x format/);
- });
-
- it('loads models from `./models`', function() {
+ it('loads models from `./models`', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('models/car.json', { name: 'Car' });
appdir.writeFileSync('models/car.js', '');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.eql({
- name: 'Car',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.eql({
name: 'Car',
- },
- sourceFile: path.resolve(appdir.PATH, 'models', 'car.js'),
+ config: {
+ dataSource: 'db',
+ },
+ definition: {
+ name: 'Car',
+ },
+ sourceFile: path.resolve(appdir.PATH, 'models', 'car.js'),
+ });
+ done();
});
});
- it('loads coffeescript models from `./models`', function() {
+ it('loads coffeescript models from `./models`', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('models/car.json', { name: 'Car' });
appdir.writeFileSync('models/car.coffee', '');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.eql({
- name: 'Car',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.eql({
name: 'Car',
- },
- sourceFile: path.resolve(appdir.PATH, 'models', 'car.coffee'),
+ config: {
+ dataSource: 'db',
+ },
+ definition: {
+ name: 'Car',
+ },
+ sourceFile: path.resolve(appdir.PATH, 'models', 'car.coffee'),
+ });
+ done();
});
});
- it('supports `modelSources` option', function() {
+ it('supports `modelSources` option', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('custom-models/car.json', { name: 'Car' });
appdir.writeFileSync('custom-models/car.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
modelSources: ['./custom-models'],
- });
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.eql({
- name: 'Car',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.eql({
name: 'Car',
- },
- sourceFile: path.resolve(appdir.PATH, 'custom-models', 'car.js'),
+ config: {
+ dataSource: 'db',
+ },
+ definition: {
+ name: 'Car',
+ },
+ sourceFile: path.resolve(appdir.PATH, 'custom-models', 'car.js'),
+ });
+ done();
});
});
- it('supports `sources` option in `model-config.json`', function() {
+ it('supports `sources` option in `model-config.json`', function(done) {
appdir.createConfigFilesSync({}, {}, {
_meta: {
sources: ['./custom-models'],
@@ -893,148 +1080,183 @@ describe('compiler', function() {
appdir.writeConfigFileSync('custom-models/car.json', { name: 'Car' });
appdir.writeFileSync('custom-models/car.js', '');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.eql({
- name: 'Car',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.eql({
name: 'Car',
- },
- sourceFile: path.resolve(appdir.PATH, 'custom-models', 'car.js'),
+ config: {
+ dataSource: 'db',
+ },
+ definition: {
+ name: 'Car',
+ },
+ sourceFile: path.resolve(appdir.PATH, 'custom-models', 'car.js'),
+ });
+ done();
});
});
- it('supports sources relative to node_modules', function() {
+ it('supports sources relative to node_modules', function(done) {
appdir.createConfigFilesSync({}, {}, {
User: { dataSource: 'db' },
});
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
modelSources: [
'loopback/common/models',
'loopback/common/dir-does-not-exist',
],
- });
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0]).to.eql({
- name: 'User',
- config: {
- dataSource: 'db',
- },
- definition: require('loopback/common/models/user.json'),
- sourceFile: require.resolve('loopback/common/models/user.js'),
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0]).to.eql({
+ name: 'User',
+ config: {
+ dataSource: 'db',
+ },
+ definition: require('loopback/common/models/user.json'),
+ sourceFile: require.resolve('loopback/common/models/user.js'),
+ });
+ done();
});
});
- it('resolves relative path in `modelSources` option', function() {
+ it('resolves relative path in `modelSources` option', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('custom-models/car.json', { name: 'Car' });
var appJS = appdir.writeFileSync('custom-models/car.js', '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
modelSources: ['./custom-models'],
- });
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0].sourceFile).to.equal(appJS);
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0].sourceFile).to.equal(appJS);
+ done();
+ });
});
- it('resolves module relative path in `modelSources` option', function() {
- appdir.createConfigFilesSync({}, {}, {
- Car: { dataSource: 'db' },
- });
- appdir.writeConfigFileSync('node_modules/custom-models/car.json',
- { name: 'Car' });
- var appJS = appdir.writeFileSync('node_modules/custom-models/car.js', '');
+ it('resolves module relative path in `modelSources` option',
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ Car: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('node_modules/custom-models/car.json',
+ { name: 'Car' });
+ var appJS = appdir.writeFileSync(
+ 'node_modules/custom-models/car.js', '');
- var instructions = boot.compile({
- appRootDir: appdir.PATH,
- modelSources: ['custom-models'],
- });
+ boot.compile({
+ appRootDir: appdir.PATH,
+ modelSources: ['custom-models'],
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0].sourceFile).to.equal(appJS);
- });
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0].sourceFile).to.equal(appJS);
+ done();
+ });
+ });
it('resolves relative path in `sources` option in `model-config.json`',
- function() {
- appdir.createConfigFilesSync({}, {}, {
- _meta: {
- sources: ['./custom-models'],
- },
- Car: { dataSource: 'db' },
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ _meta: {
+ sources: ['./custom-models'],
+ },
+ Car: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('custom-models/car.json', { name: 'Car' });
+ var appJS = appdir.writeFileSync('custom-models/car.js', '');
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0].sourceFile).to.equal(appJS);
+ done();
+ });
});
- appdir.writeConfigFileSync('custom-models/car.json', { name: 'Car' });
- var appJS = appdir.writeFileSync('custom-models/car.js', '');
-
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0].sourceFile).to.equal(appJS);
- });
it('resolves module relative path in `sources` option in model-config.json',
- function() {
- appdir.createConfigFilesSync({}, {}, {
- _meta: {
- sources: ['custom-models'],
- },
- Car: { dataSource: 'db' },
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ _meta: {
+ sources: ['custom-models'],
+ },
+ Car: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('node_modules/custom-models/car.json',
+ { name: 'Car' });
+
+ var appJS = appdir.writeFileSync(
+ 'node_modules/custom-models/car.js', '');
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.models).to.have.length(1);
+ expect(instructions.models[0].sourceFile).to.equal(appJS);
+ done();
+ });
});
- appdir.writeConfigFileSync('node_modules/custom-models/car.json',
- { name: 'Car' });
- var appJS = appdir.writeFileSync('node_modules/custom-models/car.js', '');
-
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.models).to.have.length(1);
- expect(instructions.models[0].sourceFile).to.equal(appJS);
- });
-
- it('handles model definitions with no code', function() {
+ it('handles model definitions with no code', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('models/car.json', { name: 'Car' });
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.eql([{
- name: 'Car',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.eql([{
name: 'Car',
- },
- sourceFile: undefined,
- }]);
+ config: {
+ dataSource: 'db',
+ },
+ definition: {
+ name: 'Car',
+ },
+ sourceFile: undefined,
+ }]);
+ done();
+ });
});
- it('excludes models not listed in `model-config.json`', function() {
+ it('excludes models not listed in `model-config.json`', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('models/car.json', { name: 'Car' });
appdir.writeConfigFileSync('models/bar.json', { name: 'Bar' });
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var models = instructions.models.map(getNameProperty);
- expect(models).to.eql(['Car']);
+ var models = instructions.models.map(getNameProperty);
+ expect(models).to.eql(['Car']);
+ done();
+ });
});
- it('includes models used as Base models', function() {
+ it('includes models used as Base models', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
@@ -1046,15 +1268,19 @@ describe('compiler', function() {
name: 'Vehicle',
});
- var instructions = boot.compile(appdir.PATH);
- var models = instructions.models;
- var modelNames = models.map(getNameProperty);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ var models = instructions.models;
+ var modelNames = models.map(getNameProperty);
- expect(modelNames).to.eql(['Vehicle', 'Car']);
- expect(models[0].config).to.equal(undefined);
+ expect(modelNames).to.eql(['Vehicle', 'Car']);
+ expect(models[0].config).to.equal(undefined);
+ done();
+ });
});
- it('excludes pre-built base models', function() {
+ it('excludes pre-built base models', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
@@ -1063,13 +1289,17 @@ describe('compiler', function() {
base: 'Model',
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['Car']);
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['Car']);
+ done();
+ });
});
- it('sorts models, base models first', function() {
+ it('sorts models, base models first', function(done) {
appdir.createConfigFilesSync({}, {}, {
Vehicle: { dataSource: 'db' },
FlyingCar: { dataSource: 'db' },
@@ -1087,13 +1317,17 @@ describe('compiler', function() {
base: 'Car',
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['Vehicle', 'Car', 'FlyingCar']);
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['Vehicle', 'Car', 'FlyingCar']);
+ done();
+ });
});
- it('detects circular Model dependencies', function() {
+ it('detects circular Model dependencies', function(done) {
appdir.createConfigFilesSync({}, {}, {
Vehicle: { dataSource: 'db' },
Car: { dataSource: 'db' },
@@ -1107,75 +1341,94 @@ describe('compiler', function() {
base: 'Car',
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/cyclic dependency/i);
+ expectToThrow(/cyclic dependency/i, done);
});
- it('uses file name as default value for model name', function() {
+ it('uses file name as default value for model name', function(done) {
appdir.createConfigFilesSync({}, {}, {
Car: { dataSource: 'db' },
});
appdir.writeConfigFileSync('models/car.json', {});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['Car']);
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['Car']);
+ done();
+ });
});
it('uses `OrderItem` as default model name for file with name `order-item`',
- function() {
- appdir.createConfigFilesSync({}, {}, {
- OrderItem: { dataSource: 'db' },
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ OrderItem: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('models/order-item.json', {});
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['OrderItem']);
+ done();
+ });
});
- appdir.writeConfigFileSync('models/order-item.json', {});
-
- var instructions = boot.compile(appdir.PATH);
-
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['OrderItem']);
- });
it('uses `OrderItem` as default model name for file with name `order_item`',
- function() {
- appdir.createConfigFilesSync({}, {}, {
- OrderItem: { dataSource: 'db' },
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ OrderItem: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('models/order_item.json', {});
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['OrderItem']);
+ done();
+ });
});
- appdir.writeConfigFileSync('models/order_item.json', {});
-
- var instructions = boot.compile(appdir.PATH);
-
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['OrderItem']);
- });
it('uses `OrderItem` as default model name for file with name `order item`',
- function() {
- appdir.createConfigFilesSync({}, {}, {
- OrderItem: { dataSource: 'db' },
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ OrderItem: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('models/order item.json', {});
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['OrderItem']);
+ done();
+ });
});
- appdir.writeConfigFileSync('models/order item.json', {});
-
- var instructions = boot.compile(appdir.PATH);
-
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['OrderItem']);
- });
it('overrides `default model name` by `name` in model definition',
- function() {
- appdir.createConfigFilesSync({}, {}, {
- overrideCar: { dataSource: 'db' },
+ function(done) {
+ appdir.createConfigFilesSync({}, {}, {
+ overrideCar: { dataSource: 'db' },
+ });
+ appdir.writeConfigFileSync('models/car.json', { name: 'overrideCar' });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ var modelNames = instructions.models.map(getNameProperty);
+ expect(modelNames).to.eql(['overrideCar']);
+ done();
+ });
});
- appdir.writeConfigFileSync('models/car.json', { name: 'overrideCar' });
- var instructions = boot.compile(appdir.PATH);
-
- var modelNames = instructions.models.map(getNameProperty);
- expect(modelNames).to.eql(['overrideCar']);
- });
-
- it('overwrites model with same default name', function() {
+ it('overwrites model with same default name', function(done) {
appdir.createConfigFilesSync({}, {}, {
'OrderItem': { dataSource: 'db' },
});
@@ -1194,24 +1447,28 @@ describe('compiler', function() {
});
var appJS = appdir.writeFileSync('models/orderItem.js', '');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.eql([{
- name: 'OrderItem',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.eql([{
name: 'OrderItem',
- properties: {
- quantity: { type: 'number' },
+ config: {
+ dataSource: 'db',
},
- },
- sourceFile: appJS,
- }]);
+ definition: {
+ name: 'OrderItem',
+ properties: {
+ quantity: { type: 'number' },
+ },
+ },
+ sourceFile: appJS,
+ }]);
+ done();
+ });
});
- it('overwrites model with same name in model definition', function() {
+ it('overwrites model with same name in model definition', function(done) {
appdir.createConfigFilesSync({}, {}, {
'customOrder': { dataSource: 'db' },
});
@@ -1232,60 +1489,76 @@ describe('compiler', function() {
});
var appJS = appdir.writeFileSync('models/order2.js', '');
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.models).to.eql([{
- name: 'customOrder',
- config: {
- dataSource: 'db',
- },
- definition: {
+ expect(instructions.models).to.eql([{
name: 'customOrder',
- properties: {
- quantity: { type: 'number' },
+ config: {
+ dataSource: 'db',
},
- },
- sourceFile: appJS,
- }]);
+ definition: {
+ name: 'customOrder',
+ properties: {
+ quantity: { type: 'number' },
+ },
+ },
+ sourceFile: appJS,
+ }]);
+ done();
+ });
});
- it('returns a new copy of JSON data', function() {
+ it('returns a new copy of JSON data', function(done) {
appdir.createConfigFilesSync();
- var instructions = boot.compile(appdir.PATH);
- instructions.application.modified = true;
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ instructions.application.modified = true;
- instructions = boot.compile(appdir.PATH);
- expect(instructions.application).to.not.have.property('modified');
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.application).to.not.have.property('modified');
+ done();
+ });
+ });
});
describe('for mixins', function() {
- describe(' - mixinDirs', function() {
- function verifyMixinIsFoundViaMixinDirs(sourceFile, mixinDirs) {
+ describe(' - mixinDirs', function(done) {
+ function verifyMixinIsFoundViaMixinDirs(sourceFile, mixinDirs, done) {
var appJS = appdir.writeFileSync(sourceFile, '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
mixinDirs: mixinDirs,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
});
-
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
}
- it('supports `mixinDirs` option', function() {
+ it('supports `mixinDirs` option', function(done) {
verifyMixinIsFoundViaMixinDirs('custom-mixins/other.js',
- ['./custom-mixins']);
+ ['./custom-mixins'], done);
});
- it('resolves relative path in `mixinDirs` option', function() {
+ it('resolves relative path in `mixinDirs` option', function(done) {
verifyMixinIsFoundViaMixinDirs('custom-mixins/other.js',
- ['./custom-mixins']);
+ ['./custom-mixins'], done);
});
- it('resolves module relative path in `mixinDirs` option', function() {
- verifyMixinIsFoundViaMixinDirs('node_modules/custom-mixins/other.js',
- ['custom-mixins']);
- });
+ it('resolves module relative path in `mixinDirs` option',
+ function(done) {
+ verifyMixinIsFoundViaMixinDirs(
+ 'node_modules/custom-mixins/other.js',
+ ['custom-mixins'], done);
+ });
});
describe(' - mixinSources', function() {
@@ -1299,35 +1572,39 @@ describe('compiler', function() {
});
});
- function verifyMixinIsFoundViaMixinSources(sourceFile, mixinSources) {
+ function verifyMixinIsFoundViaMixinSources(sourceFile, mixinSources,
+ done) {
var appJS = appdir.writeFileSync(sourceFile, '');
- var instructions = boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
mixinSources: mixinSources,
+ }, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
});
-
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
}
- it('supports `mixinSources` option', function() {
+ it('supports `mixinSources` option', function(done) {
verifyMixinIsFoundViaMixinSources('mixins/time-stamps.js',
- ['./mixins']);
+ ['./mixins'], done);
});
- it('resolves relative path in `mixinSources` option', function() {
+ it('resolves relative path in `mixinSources` option', function(done) {
verifyMixinIsFoundViaMixinSources('custom-mixins/time-stamps.js',
- ['./custom-mixins']);
+ ['./custom-mixins'], done);
});
it('resolves module relative path in `mixinSources` option',
- function() {
- verifyMixinIsFoundViaMixinSources(
- 'node_modules/custom-mixins/time-stamps.js',
- ['custom-mixins']);
- });
+ function(done) {
+ verifyMixinIsFoundViaMixinSources(
+ 'node_modules/custom-mixins/time-stamps.js',
+ ['custom-mixins'], done);
+ });
- it('supports `mixins` option in `model-config.json`', function() {
+ it('supports `mixins` option in `model-config.json`', function(done) {
appdir.createConfigFilesSync({}, {}, {
_meta: {
mixins: ['./custom-mixins'],
@@ -1338,85 +1615,117 @@ describe('compiler', function() {
});
var appJS = appdir.writeFileSync('custom-mixins/time-stamps.js', '');
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
+ });
});
- it('sets by default `mixinSources` to `mixins` directory', function() {
- var appJS = appdir.writeFileSync('mixins/time-stamps.js', '');
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
- });
+ it('sets by default `mixinSources` to `mixins` directory',
+ function(done) {
+ var appJS = appdir.writeFileSync('mixins/time-stamps.js', '');
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
+ });
+ });
- it('loads only mixins used by models', function() {
+ it('loads only mixins used by models', function(done) {
var appJS = appdir.writeFileSync('mixins/time-stamps.js', '');
appdir.writeFileSync('mixins/foo.js', '');
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.mixins).to.have.length(1);
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins).to.have.length(1);
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
+ });
});
- it('loads mixins from model using mixin name in JSON file', function() {
- var appJS = appdir.writeFileSync('mixins/time-stamps.js', '');
- appdir.writeConfigFileSync('mixins/time-stamps.json', {
- name: 'Timestamping',
- });
+ it('loads mixins from model using mixin name in JSON file',
+ function(done) {
+ var appJS = appdir.writeFileSync('mixins/time-stamps.js', '');
+ appdir.writeConfigFileSync('mixins/time-stamps.json', {
+ name: 'Timestamping',
+ });
- appdir.writeConfigFileSync('models/car.json', {
- name: 'Car',
- mixins: { 'Timestamping': {}},
- });
+ appdir.writeConfigFileSync('models/car.json', {
+ name: 'Car',
+ mixins: { 'Timestamping': {}},
+ });
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.mixins).to.have.length(1);
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
- });
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins).to.have.length(1);
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
+ });
+ });
it('loads mixin only once for dirs common to mixinDirs & mixinSources',
- function() {
- var appJS = appdir.writeFileSync('custom-mixins/time-stamps.js', '');
+ function(done) {
+ var appJS = appdir.writeFileSync(
+ 'custom-mixins/time-stamps.js', '');
- var options = {
- appRootDir: appdir.PATH,
- mixinDirs: ['./custom-mixins'],
- mixinSources: ['./custom-mixins'],
- };
+ var options = {
+ appRootDir: appdir.PATH,
+ mixinDirs: ['./custom-mixins'],
+ mixinSources: ['./custom-mixins'],
+ };
- var instructions = boot.compile(options);
- expect(instructions.mixins).to.have.length(1);
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
- });
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins).to.have.length(1);
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
+ });
+ });
it('loads mixin from mixinSources, when it is also found in mixinDirs',
- function() {
- appdir.writeFileSync('mixinDir/time-stamps.js', '');
- var appJS = appdir.writeFileSync('mixinSource/time-stamps.js', '');
+ function(done) {
+ appdir.writeFileSync('mixinDir/time-stamps.js', '');
+ var appJS = appdir.writeFileSync('mixinSource/time-stamps.js', '');
- var options = {
- appRootDir: appdir.PATH,
- mixinDirs: ['./mixinDir'],
- mixinSources: ['./mixinSource'],
- };
+ var options = {
+ appRootDir: appdir.PATH,
+ mixinDirs: ['./mixinDir'],
+ mixinSources: ['./mixinSource'],
+ };
- var instructions = boot.compile(options);
- expect(instructions.mixins).to.have.length(1);
- expect(instructions.mixins[0].sourceFile).to.eql(appJS);
- });
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins).to.have.length(1);
+ expect(instructions.mixins[0].sourceFile).to.eql(appJS);
+ done();
+ });
+ });
- it('loads mixin from the most recent mixin definition', function() {
- appdir.writeFileSync('mixins1/time-stamps.js', '');
- var mixins2 = appdir.writeFileSync('mixins2/time-stamps.js', '');
+ it('loads mixin from the most recent mixin definition',
+ function(done) {
+ appdir.writeFileSync('mixins1/time-stamps.js', '');
+ var mixins2 = appdir.writeFileSync('mixins2/time-stamps.js', '');
- var options = {
- appRootDir: appdir.PATH,
- mixinSources: ['./mixins1', './mixins2'],
- };
+ var options = {
+ appRootDir: appdir.PATH,
+ mixinSources: ['./mixins1', './mixins2'],
+ };
- var instructions = boot.compile(options);
- expect(instructions.mixins).to.have.length(1);
- expect(instructions.mixins[0].sourceFile).to.eql(mixins2);
- });
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.mixins).to.have.length(1);
+ expect(instructions.mixins[0].sourceFile).to.eql(mixins2);
+ done();
+ });
+ });
});
describe('name normalization', function() {
@@ -1431,129 +1740,166 @@ describe('compiler', function() {
appdir.writeFileSync('custom-mixins/space name.js', '');
});
- it('supports classify', function() {
+ it('supports classify', function(done) {
options.normalization = 'classify';
- var instructions = boot.compile(options);
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var mixins = instructions.mixins;
- var mixinNames = mixins.map(getNameProperty);
+ var mixins = instructions.mixins;
+ var mixinNames = mixins.map(getNameProperty);
- expect(mixinNames).to.eql([
- 'CamelCase', 'Foo', 'PascalCase', 'SpaceName', 'TimeStamps',
- ]);
+ expect(mixinNames).to.eql([
+ 'CamelCase', 'Foo', 'PascalCase', 'SpaceName', 'TimeStamps',
+ ]);
+ done();
+ });
});
- it('supports dasherize', function() {
+ it('supports dasherize', function(done) {
options.normalization = 'dasherize';
- var instructions = boot.compile(options);
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var mixins = instructions.mixins;
- var mixinNames = mixins.map(getNameProperty);
+ var mixins = instructions.mixins;
+ var mixinNames = mixins.map(getNameProperty);
- expect(mixinNames).to.eql([
- 'camel-case', 'foo', 'pascal-case', 'space-name', 'time-stamps',
- ]);
+ expect(mixinNames).to.eql([
+ 'camel-case', 'foo', 'pascal-case', 'space-name', 'time-stamps',
+ ]);
+ done();
+ });
});
- it('supports custom function', function() {
- var normalize = function(name) { return name.toUpperCase(); };
+ it('supports custom function', function(done) {
+ var normalize = function(name) {
+ return name.toUpperCase();
+ };
options.normalization = normalize;
- var instructions = boot.compile(options);
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var mixins = instructions.mixins;
- var mixinNames = mixins.map(getNameProperty);
+ var mixins = instructions.mixins;
+ var mixinNames = mixins.map(getNameProperty);
- expect(mixinNames).to.eql([
- 'CAMELCASE', 'FOO', 'PASCALCASE', 'SPACE NAME', 'TIME-STAMPS',
- ]);
+ expect(mixinNames).to.eql([
+ 'CAMELCASE', 'FOO', 'PASCALCASE', 'SPACE NAME', 'TIME-STAMPS',
+ ]);
+ done();
+ });
});
- it('supports none', function() {
+ it('supports none', function(done) {
options.normalization = 'none';
- var instructions = boot.compile(options);
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var mixins = instructions.mixins;
- var mixinNames = mixins.map(getNameProperty);
+ var mixins = instructions.mixins;
+ var mixinNames = mixins.map(getNameProperty);
- expect(mixinNames).to.eql([
- 'camelCase', 'foo', 'PascalCase', 'space name', 'time-stamps',
- ]);
+ expect(mixinNames).to.eql([
+ 'camelCase', 'foo', 'PascalCase', 'space name', 'time-stamps',
+ ]);
+ done();
+ });
});
- it('supports false', function() {
+ it('supports false', function(done) {
options.normalization = false;
- var instructions = boot.compile(options);
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var mixins = instructions.mixins;
- var mixinNames = mixins.map(getNameProperty);
+ var mixins = instructions.mixins;
+ var mixinNames = mixins.map(getNameProperty);
- expect(mixinNames).to.eql([
- 'camelCase', 'foo', 'PascalCase', 'space name', 'time-stamps',
- ]);
+ expect(mixinNames).to.eql([
+ 'camelCase', 'foo', 'PascalCase', 'space name', 'time-stamps',
+ ]);
+ done();
+ });
});
- it('defaults to classify', function() {
- var instructions = boot.compile(options);
+ it('defaults to classify', function(done) {
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var mixins = instructions.mixins;
- var mixinNames = mixins.map(getNameProperty);
+ var mixins = instructions.mixins;
+ var mixinNames = mixins.map(getNameProperty);
- expect(mixinNames).to.eql([
- 'CamelCase', 'Foo', 'PascalCase', 'SpaceName', 'TimeStamps',
- ]);
+ expect(mixinNames).to.eql([
+ 'CamelCase', 'Foo', 'PascalCase', 'SpaceName', 'TimeStamps',
+ ]);
+ done();
+ });
});
- it('throws error for invalid normalization format', function() {
+ it('throws error for invalid normalization format', function(done) {
options.normalization = 'invalidFormat';
- expect(function() { boot.compile(options); })
- .to.throw(/Invalid normalization format - "invalidFormat"/);
+ expectToThrow(/Invalid normalization format - "invalidFormat"/,
+ done, options);
});
});
- it('overrides default mixin name, by `name` in JSON', function() {
+ it('overrides default mixin name, by `name` in JSON', function(done) {
appdir.writeFileSync('mixins/foo.js', '');
appdir.writeConfigFileSync('mixins/foo.json', { name: 'fooBar' });
- var options = { appRootDir: appdir.PATH,
+ var options = {
+ appRootDir: appdir.PATH,
mixinDirs: ['./mixins'],
};
- var instructions = boot.compile(options);
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.mixins[0].name).to.eql('fooBar');
+ expect(instructions.mixins[0].name).to.eql('fooBar');
+ done();
+ });
});
- it('extends definition from JSON with same file name', function() {
+ it('extends definition from JSON with same file name', function(done) {
var appJS = appdir.writeFileSync('custom-mixins/foo-bar.js', '');
appdir.writeConfigFileSync('custom-mixins/foo-bar.json', {
- description: 'JSON file name same as JS file name' });
+ description: 'JSON file name same as JS file name',
+ });
appdir.writeConfigFileSync('custom-mixins/FooBar.json', {
- description: 'JSON file name same as normalized name of mixin' });
+ description: 'JSON file name same as normalized name of mixin',
+ });
- var options = { appRootDir: appdir.PATH,
+ var options = {
+ appRootDir: appdir.PATH,
mixinDirs: ['./custom-mixins'],
- normalization: 'classify' };
- var instructions = boot.compile(options);
+ normalization: 'classify',
+ };
+ boot.compile(options, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.mixins).to.eql([
- {
- name: 'FooBar',
- description: 'JSON file name same as JS file name',
- sourceFile: appJS,
- },
- ]);
+ expect(instructions.mixins).to.eql([
+ {
+ name: 'FooBar',
+ description: 'JSON file name same as JS file name',
+ sourceFile: appJS,
+ },
+ ]);
+ });
+ done();
});
});
});
describe('for middleware', function() {
- function testMiddlewareRegistration(middlewareId, sourceFile) {
+ function testMiddlewareRegistration(middlewareId, sourceFile, done) {
var json = {
- initial: {
- },
- custom: {
- },
+ initial: {},
+ custom: {},
};
json.custom[middlewareId] = {
@@ -1562,19 +1908,23 @@ describe('compiler', function() {
appdir.writeConfigFileSync('middleware.json', json);
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware).to.eql({
- phases: ['initial', 'custom'],
- middleware: [
- {
- sourceFile: sourceFile,
- config: {
- phase: 'custom',
- params: 'some-config-data',
+ expect(instructions.middleware).to.eql({
+ phases: ['initial', 'custom'],
+ middleware: [
+ {
+ sourceFile: sourceFile,
+ config: {
+ phase: 'custom',
+ params: 'some-config-data',
+ },
},
- },
- ],
+ ],
+ });
+ done();
});
}
@@ -1585,14 +1935,14 @@ describe('compiler', function() {
'loopback/server/middleware/url-not-found');
});
- it('emits middleware instructions', function() {
+ it('emits middleware instructions', function(done) {
testMiddlewareRegistration('loopback/server/middleware/url-not-found',
- sourceFileForUrlNotFound);
+ sourceFileForUrlNotFound, done);
});
- it('emits middleware instructions for fragment', function() {
+ it('emits middleware instructions for fragment', function(done) {
testMiddlewareRegistration('loopback#url-not-found',
- sourceFileForUrlNotFound);
+ sourceFileForUrlNotFound, done);
});
it('supports `middlewareRootDir` option', function() {
@@ -1628,47 +1978,42 @@ describe('compiler', function() {
});
});
- it('fails when a module middleware cannot be resolved', function() {
+ it('fails when a module middleware cannot be resolved', function(done) {
appdir.writeConfigFileSync('middleware.json', {
final: {
- 'loopback/path-does-not-exist': { },
+ 'loopback/path-does-not-exist': {},
},
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw(/path-does-not-exist/);
+ expectToThrow(/path-does-not-exist/, done);
});
it('does not fail when an optional middleware cannot be resolved',
- function() {
- appdir.writeConfigFileSync('middleware.json', {
- final: {
- 'loopback/path-does-not-exist': {
- optional: 'this middleware is optional',
- },
- },
- });
-
- expect(function() { boot.compile(appdir.PATH); })
- .to.not.throw();
- });
-
- it('fails when a module middleware fragment cannot be resolved',
- function() {
+ function(done) {
appdir.writeConfigFileSync('middleware.json', {
final: {
- 'loopback#path-does-not-exist': { },
+ 'loopback/path-does-not-exist': {
+ optional: 'this middleware is optional',
+ },
},
});
- expect(function() {
- boot.compile(appdir.PATH);
- })
- .to.throw(/path-does-not-exist/);
+ expectToNotThrow(done);
+ });
+
+ it('fails when a module middleware fragment cannot be resolved',
+ function(done) {
+ appdir.writeConfigFileSync('middleware.json', {
+ final: {
+ 'loopback#path-does-not-exist': {},
+ },
+ });
+
+ expectToThrow(/path-does-not-exist/, done);
});
it('does not fail when an optional middleware fragment cannot be resolved',
- function() {
+ function(done) {
appdir.writeConfigFileSync('middleware.json', {
final: {
'loopback#path-does-not-exist': {
@@ -1677,31 +2022,34 @@ describe('compiler', function() {
},
});
- expect(function() { boot.compile(appdir.PATH); })
- .to.not.throw();
+ expectToNotThrow(done);
});
- it('resolves paths relatively to appRootDir', function() {
+ it('resolves paths relatively to appRootDir', function(done) {
appdir.writeFileSync('my-middleware.js', '');
appdir.writeConfigFileSync('./middleware.json', {
routes: {
// resolves to ./my-middleware.js
- './my-middleware': { },
+ './my-middleware': {},
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware).to.eql({
- phases: ['routes'],
- middleware: [{
- sourceFile: path.resolve(appdir.PATH, 'my-middleware.js'),
- config: { phase: 'routes' },
- }],
+ expect(instructions.middleware).to.eql({
+ phases: ['routes'],
+ middleware: [{
+ sourceFile: path.resolve(appdir.PATH, 'my-middleware.js'),
+ config: { phase: 'routes' },
+ }],
+ });
+ done();
});
});
- it('merges config.params', function() {
+ it('merges config.params', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': {
@@ -1722,14 +2070,18 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expectFirstMiddlewareParams(instructions).to.eql({
- key: 'custom value',
+ expectFirstMiddlewareParams(instructions).to.eql({
+ key: 'custom value',
+ });
+ done();
});
});
- it('merges config.enabled', function() {
+ it('merges config.enabled', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': {
@@ -1748,39 +2100,47 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware[0].config)
- .to.have.property('enabled', false);
+ expect(instructions.middleware.middleware[0].config)
+ .to.have.property('enabled', false);
+ done();
+ });
});
- function verifyMiddlewareConfig() {
- var instructions = boot.compile(appdir.PATH);
+ function verifyMiddlewareConfig(done) {
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware)
- .to.eql([
- {
- sourceFile: path.resolve(appdir.PATH, 'middleware'),
- config: {
- phase: 'routes',
- params: {
- key: 'initial value',
+ expect(instructions.middleware.middleware)
+ .to.eql([
+ {
+ sourceFile: path.resolve(appdir.PATH, 'middleware'),
+ config: {
+ phase: 'routes',
+ params: {
+ key: 'initial value',
+ },
},
},
- },
- {
- sourceFile: path.resolve(appdir.PATH, 'middleware'),
- config: {
- phase: 'routes',
- params: {
- key: 'custom value',
+ {
+ sourceFile: path.resolve(appdir.PATH, 'middleware'),
+ config: {
+ phase: 'routes',
+ params: {
+ key: 'custom value',
+ },
},
},
- },
- ]);
+ ]);
+ done();
+ });
}
- it('merges config.params array to array', function() {
+ it('merges config.params array to array', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': [{
@@ -1801,10 +2161,10 @@ describe('compiler', function() {
},
});
- verifyMiddlewareConfig();
+ verifyMiddlewareConfig(done);
});
- it('merges config.params array to object', function() {
+ it('merges config.params array to object', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': {
@@ -1825,10 +2185,10 @@ describe('compiler', function() {
},
});
- verifyMiddlewareConfig();
+ verifyMiddlewareConfig(done);
});
- it('merges config.params object to array', function() {
+ it('merges config.params object to array', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': [{
@@ -1849,10 +2209,10 @@ describe('compiler', function() {
},
});
- verifyMiddlewareConfig();
+ verifyMiddlewareConfig(done);
});
- it('merges config.params array to empty object', function() {
+ it('merges config.params array to empty object', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': {},
@@ -1869,23 +2229,27 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware)
- .to.eql([
- {
- sourceFile: path.resolve(appdir.PATH, 'middleware'),
- config: {
- phase: 'routes',
- params: {
- key: 'custom value',
+ expect(instructions.middleware.middleware)
+ .to.eql([
+ {
+ sourceFile: path.resolve(appdir.PATH, 'middleware'),
+ config: {
+ phase: 'routes',
+ params: {
+ key: 'custom value',
+ },
},
},
- },
- ]);
+ ]);
+ });
+ done();
});
- it('merges config.params array to array by name', function() {
+ it('merges config.params array to array by name', function(done) {
appdir.writeConfigFileSync('./middleware.json', {
routes: {
'./middleware': [{
@@ -1912,62 +2276,67 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware)
- .to.eql([
- {
- sourceFile: path.resolve(appdir.PATH, 'middleware'),
- config: {
- name: 'a',
- phase: 'routes',
- params: {
- key: 'custom value',
+ expect(instructions.middleware.middleware)
+ .to.eql([
+ {
+ sourceFile: path.resolve(appdir.PATH, 'middleware'),
+ config: {
+ name: 'a',
+ phase: 'routes',
+ params: {
+ key: 'custom value',
+ },
},
},
- },
- {
- sourceFile: path.resolve(appdir.PATH, 'middleware'),
- config: {
- phase: 'routes',
- params: {
- key: '2nd value',
+ {
+ sourceFile: path.resolve(appdir.PATH, 'middleware'),
+ config: {
+ phase: 'routes',
+ params: {
+ key: '2nd value',
+ },
},
},
- },
- ]);
+ ]);
+ done();
+ });
});
- it('flattens sub-phases', function() {
+ it('flattens sub-phases', function(done) {
appdir.writeConfigFileSync('middleware.json', {
- 'initial:after': {
- },
+ 'initial:after': {},
'custom:before': {
'loopback/server/middleware/url-not-found': {
params: 'some-config-data',
},
},
- 'custom:after': {
-
- },
+ 'custom:after': {},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.phases, 'phases')
- .to.eql(['initial', 'custom']);
- expect(instructions.middleware.middleware, 'middleware')
- .to.eql([{
- sourceFile:
- require.resolve('loopback/server/middleware/url-not-found'),
- config: {
- phase: 'custom:before',
- params: 'some-config-data',
- },
- }]);
+ expect(instructions.middleware.phases, 'phases')
+ .to.eql(['initial', 'custom']);
+ expect(instructions.middleware.middleware, 'middleware')
+ .to.eql([{
+ sourceFile: require.resolve(
+ 'loopback/server/middleware/url-not-found'),
+ config: {
+ phase: 'custom:before',
+ params: 'some-config-data',
+ },
+ }]);
+ done();
+ });
});
- it('supports multiple instances of the same middleware', function() {
+ it('supports multiple instances of the same middleware', function(done) {
appdir.writeFileSync('my-middleware.js', '');
appdir.writeConfigFileSync('middleware.json', {
'final': {
@@ -1982,74 +2351,89 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware)
- .to.eql([
- {
- sourceFile: path.resolve(appdir.PATH, 'my-middleware.js'),
- config: {
- phase: 'final',
- params: 'first',
+ expect(instructions.middleware.middleware)
+ .to.eql([
+ {
+ sourceFile: path.resolve(appdir.PATH, 'my-middleware.js'),
+ config: {
+ phase: 'final',
+ params: 'first',
+ },
},
- },
- {
- sourceFile: path.resolve(appdir.PATH, 'my-middleware.js'),
- config: {
- phase: 'final',
- params: 'second',
+ {
+ sourceFile: path.resolve(appdir.PATH, 'my-middleware.js'),
+ config: {
+ phase: 'final',
+ params: 'second',
+ },
},
- },
- ]);
+ ]);
+ done();
+ });
});
- it('supports shorthand notation for middleware paths', function() {
+ it('supports shorthand notation for middleware paths', function(done) {
appdir.writeConfigFileSync('middleware.json', {
'final': {
'loopback#url-not-found': {},
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware[0].sourceFile)
- .to.equal(require.resolve('loopback/server/middleware/url-not-found'));
+ expect(instructions.middleware.middleware[0].sourceFile).to.equal(
+ require.resolve('loopback/server/middleware/url-not-found'));
+ done();
+ });
});
- it('supports shorthand notation for relative paths', function() {
+ it('supports shorthand notation for relative paths', function(done) {
appdir.writeConfigFileSync('middleware.json', {
'routes': {
- './middleware/index#myMiddleware': {
- },
+ './middleware/index#myMiddleware': {},
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware[0].sourceFile)
- .to.equal(path.resolve(appdir.PATH,
+ expect(instructions.middleware.middleware[0].sourceFile)
+ .to.equal(path.resolve(appdir.PATH,
'./middleware/index.js'));
- expect(instructions.middleware.middleware[0]).have.property(
- 'fragment',
- 'myMiddleware');
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'fragment',
+ 'myMiddleware');
+ done();
+ });
});
it('supports shorthand notation when the fragment name matches a property',
- function() {
+ function(done) {
appdir.writeConfigFileSync('middleware.json', {
'final': {
'loopback#errorHandler': {},
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile',
- pathWithoutIndex(require.resolve('loopback')));
- expect(instructions.middleware.middleware[0]).have.property(
- 'fragment',
- 'errorHandler');
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile',
+ pathWithoutIndex(require.resolve('loopback')));
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'fragment',
+ 'errorHandler');
+ done();
+ });
});
it('resolves modules relative to appRootDir', function() {
@@ -2064,11 +2448,15 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile',
- pathWithoutIndex(appdir.resolve(HANDLER_FILE)));
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile',
+ pathWithoutIndex(appdir.resolve(HANDLER_FILE)));
+ done();
+ });
});
it('prefers appRootDir over node_modules for middleware', function() {
@@ -2080,31 +2468,40 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware).to.have.length(1);
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile', appJS);
+ expect(instructions.middleware.middleware).to.have.length(1);
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile', appJS);
+ done();
+ });
});
it('does not treat module relative path as `appRootDir` relative',
- function() {
- appdir.writeFileSync('./my-middleware.js', '');
- var moduleJS = appdir.writeFileSync('node_modules/my-middleware.js', '');
- appdir.writeConfigFileSync('middleware.json', {
- 'routes': {
- 'my-middleware': {},
- },
+ function(done) {
+ appdir.writeFileSync('./my-middleware.js', '');
+ var moduleJS = appdir.writeFileSync(
+ 'node_modules/my-middleware.js', '');
+ appdir.writeConfigFileSync('middleware.json', {
+ 'routes': {
+ 'my-middleware': {},
+ },
+ });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.middleware.middleware).to.have.length(1);
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile', moduleJS);
+ done();
+ });
});
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.middleware.middleware).to.have.length(1);
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile', moduleJS);
- });
-
- it('loads middleware from coffeescript in appRootdir', function() {
+ it('loads middleware from coffeescript in appRootdir', function(done) {
var coffee = appdir.writeFileSync('my-middleware.coffee', '');
appdir.writeConfigFileSync('middleware.json', {
'routes': {
@@ -2112,65 +2509,82 @@ describe('compiler', function() {
},
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile', coffee);
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile', coffee);
+ done();
+ });
});
it('loads coffeescript from middleware under node_modules',
- function() {
- var file = appdir.writeFileSync('node_modules/my-middleware/index.coffee',
- '');
- appdir.writeFileSync('node_modules/my-middleware/index.json', '');
- appdir.writeConfigFileSync('middleware.json', {
- 'routes': {
- 'my-middleware': {},
- },
+ function(done) {
+ var file = appdir.writeFileSync(
+ 'node_modules/my-middleware/index.coffee',
+ '');
+ appdir.writeFileSync('node_modules/my-middleware/index.json', '');
+ appdir.writeConfigFileSync('middleware.json', {
+ 'routes': {
+ 'my-middleware': {},
+ },
+ });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.middleware.middleware).to.have.length(1);
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile', pathWithoutIndex(file));
+ done();
+ });
});
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.middleware.middleware).to.have.length(1);
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile', pathWithoutIndex(file));
- });
-
it('prefers coffeescript over json for relative middleware path',
- function() {
- var coffee = appdir.writeFileSync('my-middleware.coffee', '');
- appdir.writeFileSync('my-middleware.json', '');
- appdir.writeConfigFileSync('middleware.json', {
- 'routes': {
- './my-middleware': {},
- },
+ function(done) {
+ var coffee = appdir.writeFileSync('my-middleware.coffee', '');
+ appdir.writeFileSync('my-middleware.json', '');
+ appdir.writeConfigFileSync('middleware.json', {
+ 'routes': {
+ './my-middleware': {},
+ },
+ });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.middleware.middleware).to.have.length(1);
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile', coffee);
+ done();
+ });
});
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.middleware.middleware).to.have.length(1);
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile', coffee);
- });
-
it('prefers coffeescript over json for module relative middleware path',
- function() {
- var coffee = appdir.writeFileSync('node_modules/my-middleware.coffee',
- '');
- appdir.writeFileSync('node_modules/my-middleware.json', '');
- appdir.writeConfigFileSync('middleware.json', {
- 'routes': {
- 'my-middleware': {},
- },
+ function(done) {
+ var coffee = appdir.writeFileSync('node_modules/my-middleware.coffee',
+ '');
+ appdir.writeFileSync('node_modules/my-middleware.json', '');
+ appdir.writeConfigFileSync('middleware.json', {
+ 'routes': {
+ 'my-middleware': {},
+ },
+ });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.middleware.middleware).to.have.length(1);
+ expect(instructions.middleware.middleware[0]).have.property(
+ 'sourceFile', coffee);
+ done();
+ });
});
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.middleware.middleware).to.have.length(1);
- expect(instructions.middleware.middleware[0]).have.property(
- 'sourceFile', coffee);
- });
-
describe('config with relative paths in params', function() {
var RELATIVE_PATH_PARAMS = [
'$!./here',
@@ -2184,67 +2598,92 @@ describe('compiler', function() {
});
});
- it('converts paths in top-level array items', function() {
+ it('converts paths in top-level array items', function(done) {
givenMiddlewareEntrySync({ params: RELATIVE_PATH_PARAMS });
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expectFirstMiddlewareParams(instructions)
- .to.eql(absolutePathParams);
+ expectFirstMiddlewareParams(instructions)
+ .to.eql(absolutePathParams);
+ done();
+ });
});
- it('converts paths in top-level object properties', function() {
- givenMiddlewareEntrySync({ params: {
- path: RELATIVE_PATH_PARAMS[0],
- }});
-
- var instructions = boot.compile(appdir.PATH);
-
- expectFirstMiddlewareParams(instructions)
- .to.eql({ path: absolutePathParams[0] });
- });
-
- it('converts path value when params is a string', function() {
- givenMiddlewareEntrySync({ params: RELATIVE_PATH_PARAMS[0] });
-
- var instructions = boot.compile(appdir.PATH);
-
- expectFirstMiddlewareParams(instructions)
- .to.eql(absolutePathParams[0]);
- });
-
- it('converts paths in nested properties', function() {
- givenMiddlewareEntrySync({ params: {
- nestedObject: {
+ it('converts paths in top-level object properties', function(done) {
+ givenMiddlewareEntrySync({
+ params: {
path: RELATIVE_PATH_PARAMS[0],
},
- nestedArray: RELATIVE_PATH_PARAMS,
- }});
+ });
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- expectFirstMiddlewareParams(instructions)
- .to.eql({
+ expectFirstMiddlewareParams(instructions)
+ .to.eql({ path: absolutePathParams[0] });
+ done();
+ });
+ });
+
+ it('converts path value when params is a string', function(done) {
+ givenMiddlewareEntrySync({ params: RELATIVE_PATH_PARAMS[0] });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expectFirstMiddlewareParams(instructions)
+ .to.eql(absolutePathParams[0]);
+ done();
+ });
+ });
+
+ it('converts paths in nested properties', function(done) {
+ givenMiddlewareEntrySync({
+ params: {
nestedObject: {
- path: absolutePathParams[0],
+ path: RELATIVE_PATH_PARAMS[0],
},
- nestedArray: absolutePathParams,
+ nestedArray: RELATIVE_PATH_PARAMS,
+ },
+ });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expectFirstMiddlewareParams(instructions)
+ .to.eql({
+ nestedObject: {
+ path: absolutePathParams[0],
+ },
+ nestedArray: absolutePathParams,
+ });
+ done();
+ });
+ });
+
+ it('does not convert values not starting with `./` or `../`',
+ function(done) {
+ var PARAMS = ['$!.somerc', '$!/root', '$!hello!'];
+ givenMiddlewareEntrySync({ params: PARAMS });
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expectFirstMiddlewareParams(instructions).to.eql(PARAMS);
+ done();
});
- });
-
- it('does not convert values not starting with `./` or `../`', function() {
- var PARAMS = ['$!.somerc', '$!/root', '$!hello!'];
- givenMiddlewareEntrySync({ params: PARAMS });
-
- var instructions = boot.compile(appdir.PATH);
-
- expectFirstMiddlewareParams(instructions).to.eql(PARAMS);
- });
+ });
});
});
describe('for components', function() {
- it('loads component configs from multiple files', function() {
+ it('loads component configs from multiple files', function(done) {
appdir.createConfigFilesSync();
appdir.writeConfigFileSync('component-config.json', {
debug: { option: 'value' },
@@ -2258,16 +2697,20 @@ describe('compiler', function() {
debug: { env: 'applied' },
});
- var instructions = boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
- var component = instructions.components[0];
- expect(component).to.eql({
- sourceFile: require.resolve('debug'),
- config: {
- option: 'value',
- local: 'applied',
- env: 'applied',
- },
+ var component = instructions.components[0];
+ expect(component).to.eql({
+ sourceFile: require.resolve('debug'),
+ config: {
+ option: 'value',
+ local: 'applied',
+ env: 'applied',
+ },
+ });
+ done();
});
});
@@ -2295,73 +2738,89 @@ describe('compiler', function() {
});
});
- it('loads component relative to appRootDir', function() {
+ it('loads component relative to appRootDir', function(done) {
appdir.writeConfigFileSync('./component-config.json', {
- './index': { },
+ './index': {},
});
var appJS = appdir.writeConfigFileSync('index.js', '');
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.components[0]).have.property(
- 'sourceFile', appJS
- );
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.components[0]).have.property(
+ 'sourceFile', appJS
+ );
+ done();
+ });
});
- it('loads component relative to node modules', function() {
+ it('loads component relative to node modules', function(done) {
appdir.writeConfigFileSync('component-config.json', {
- 'mycomponent': { },
+ 'mycomponent': {},
});
var js = appdir.writeConfigFileSync('node_modules/mycomponent/index.js',
'');
- var instructions = boot.compile(appdir.PATH);
- expect(instructions.components[0]).have.property(
- 'sourceFile', js
- );
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+ expect(instructions.components[0]).have.property(
+ 'sourceFile', js
+ );
+ done();
+ });
});
it('retains backward compatibility for non-relative path in `appRootDir`',
- function() {
- appdir.writeConfigFileSync('component-config.json', {
- 'my-component/component.js': { },
- });
- appdir.writeConfigFileSync('./my-component/component.js', '');
+ function(done) {
+ appdir.writeConfigFileSync('component-config.json', {
+ 'my-component/component.js': {},
+ });
+ appdir.writeConfigFileSync('./my-component/component.js', '');
- expect(function() { boot.compile(appdir.PATH); })
- .to.throw('Cannot resolve path \"my-component/component.js\"');
- });
+ expectToThrow('Cannot resolve path \"my-component/component.js\"',
+ done);
+ });
it('prefers coffeescript over json for relative path component',
- function() {
- appdir.writeConfigFileSync('component-config.json', {
- './component': { },
+ function(done) {
+ appdir.writeConfigFileSync('component-config.json', {
+ './component': {},
+ });
+
+ var coffee = appdir.writeFileSync('component.coffee', '');
+ appdir.writeFileSync('component.json', '');
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.components).to.have.length(1);
+ expect(instructions.components[0]).have.property(
+ 'sourceFile', coffee);
+ done();
+ });
});
- var coffee = appdir.writeFileSync('component.coffee', '');
- appdir.writeFileSync('component.json', '');
-
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.components).to.have.length(1);
- expect(instructions.components[0]).have.property(
- 'sourceFile', coffee);
- });
-
it('prefers coffeescript over json for module relative component path',
- function() {
- appdir.writeConfigFileSync('component-config.json', {
- 'component': { },
+ function(done) {
+ appdir.writeConfigFileSync('component-config.json', {
+ 'component': {},
+ });
+
+ var coffee = appdir.writeFileSync('node_modules/component.coffee', '');
+ appdir.writeFileSync('node_modules/component.json', '');
+
+ boot.compile(appdir.PATH, function(err, context) {
+ if (err) return done(err);
+ var instructions = context.instructions;
+
+ expect(instructions.components).to.have.length(1);
+ expect(instructions.components[0]).have.property(
+ 'sourceFile', coffee);
+ done();
+ });
});
-
- var coffee = appdir.writeFileSync('node_modules/component.coffee', '');
- appdir.writeFileSync('node_modules/component.json', '');
-
- var instructions = boot.compile(appdir.PATH);
-
- expect(instructions.components).to.have.length(1);
- expect(instructions.components[0]).have.property(
- 'sourceFile', coffee);
- });
});
});
@@ -2391,3 +2850,4 @@ function pathWithoutExtension(value) {
function pathWithoutIndex(filePath) {
return filePath.replace(/[\\\/]index\.[^.]+$/, '');
}
+
diff --git a/test/executor.test.js b/test/executor.test.js
index fc7c747..b02f81b 100644
--- a/test/executor.test.js
+++ b/test/executor.test.js
@@ -63,17 +63,20 @@ describe('executor', function() {
describe('when booting', function() {
it('should set the `booting` flag during execution', function(done) {
expect(app.booting).to.be.undefined;
- boot.execute(app, simpleAppInstructions(), function(err) {
- expect(err).to.be.undefined;
- expect(process.bootingFlagSet).to.be.true;
- expect(app.booting).to.be.false;
- done();
+ simpleAppInstructions(function(err, context) {
+ if (err) return done(err);
+ boot.execute(app, context.instructions, function(err) {
+ expect(err).to.not.exist;
+ expect(process.bootingFlagSet).to.be.true;
+ expect(app.booting).to.be.false;
+ done();
+ });
});
});
it('should emit the `booted` event in the next tick', function(done) {
boot.execute(app, dummyInstructions, function(err) {
- expect(err).to.be.undefined;
+ expect(err).to.not.exist;
});
app.on('booted', function() {
// This test fails with a timeout when the `booted` event has not been
@@ -87,18 +90,21 @@ describe('executor', function() {
});
});
- it('configures models', function() {
- boot.execute(app, dummyInstructions);
- assert(app.models);
- assert(app.models.User);
- assert.equal(app.models.User, app.registry.getModel('User'),
- 'Boot should not have extended built-in User model');
- assertValidDataSource(app.models.User.dataSource);
- assert.isFunc(app.models.User, 'find');
- assert.isFunc(app.models.User, 'create');
+ it('configures models', function(done) {
+ boot.execute(app, dummyInstructions, function(err, context) {
+ if (err) return done(err);
+ assert(app.models);
+ assert(app.models.User);
+ assert.equal(app.models.User, app.registry.getModel('User'),
+ 'Boot should not have extended built-in User model');
+ assertValidDataSource(app.models.User.dataSource);
+ assert.isFunc(app.models.User, 'find');
+ assert.isFunc(app.models.User, 'create');
+ done();
+ });
});
- it('defines and customizes models', function() {
+ it('defines and customizes models', function(done) {
appdir.writeFileSync('models/Customer.js', 'module.exports = ' +
function(Customer) {
Customer.settings._customized = 'Customer';
@@ -117,15 +123,18 @@ describe('executor', function() {
sourceFile: path.resolve(appdir.PATH, 'models', 'Customer.js'),
},
],
- }));
+ }), function(err, context) {
+ if (err) return done(err);
- expect(app.models.Customer).to.exist;
- expect(app.models.Customer.settings._customized).to.be.equal('Customer');
- var UserModel = app.registry.getModel('User');
- expect(UserModel.settings._customized).to.equal('Base');
+ expect(app.models.Customer).to.exist;
+ expect(app.models.Customer.settings._customized).to.be.equal('Customer');
+ var UserModel = app.registry.getModel('User');
+ expect(UserModel.settings._customized).to.equal('Base');
+ done();
+ });
});
- it('defines model without attaching it', function() {
+ it('defines model without attaching it', function(done) {
boot.execute(app, someInstructions({
models: [
{
@@ -146,46 +155,55 @@ describe('executor', function() {
sourceFile: undefined,
},
],
- }));
-
- expect(Object.keys(app.models)).to.eql(['Car']);
+ }), function(err, context) {
+ if (err) return done(err);
+ expect(Object.keys(app.models)).to.eql(['Car']);
+ done();
+ });
});
- it('attaches models to data sources', function() {
- boot.execute(app, dummyInstructions);
- assert.equal(app.models.User.dataSource, app.dataSources.theDb);
+ it('attaches models to data sources', function(done) {
+ boot.execute(app, dummyInstructions, function(err, context) {
+ if (err) return done(err);
+ assert.equal(app.models.User.dataSource, app.dataSources.theDb);
+ done();
+ });
});
- it('defines all models first before running the config phase', function() {
- appdir.writeFileSync('models/Customer.js', 'module.exports = ' +
- function(Customer/*, Base*/) {
- Customer.on('attached', function() {
- Customer._modelsWhenAttached =
- Object.keys(Customer.modelBuilder.models);
- });
- }.toString());
+ it('defines all models first before running the config phase',
+ function(done) {
+ appdir.writeFileSync('models/Customer.js', 'module.exports = ' +
+ function(Customer/*, Base*/) {
+ Customer.on('attached', function() {
+ Customer._modelsWhenAttached =
+ Object.keys(Customer.modelBuilder.models);
+ });
+ }.toString());
- boot.execute(app, someInstructions({
- models: [
- {
- name: 'Customer',
- config: { dataSource: 'db' },
- definition: { name: 'Customer' },
- sourceFile: path.resolve(appdir.PATH, 'models', 'Customer.js'),
- },
- {
- name: 'UniqueName',
- config: { dataSource: 'db' },
- definition: { name: 'UniqueName' },
- sourceFile: undefined,
- },
- ],
- }));
+ boot.execute(app, someInstructions({
+ models: [
+ {
+ name: 'Customer',
+ config: { dataSource: 'db' },
+ definition: { name: 'Customer' },
+ sourceFile: path.resolve(appdir.PATH, 'models', 'Customer.js'),
+ },
+ {
+ name: 'UniqueName',
+ config: { dataSource: 'db' },
+ definition: { name: 'UniqueName' },
+ sourceFile: undefined,
+ },
+ ],
+ }), function(err, context) {
+ if (err) return done(err);
+ expect(app.models.Customer._modelsWhenAttached).
+ to.include('UniqueName');
+ done();
+ });
+ });
- expect(app.models.Customer._modelsWhenAttached).to.include('UniqueName');
- });
-
- it('defines models in the local app registry', function() {
+ it('defines models in the local app registry', function(done) {
app = loopback({ localRegistry: true });
boot.execute(app, someInstructions({
models: [
@@ -196,45 +214,56 @@ describe('executor', function() {
sourceFile: undefined,
},
],
- }));
-
- expect(Object.keys(loopback.registry.modelBuilder.models), 'global models')
- .to.not.contain('LocalCustomer');
- expect(Object.keys(app.registry.modelBuilder.models), 'local models')
- .to.contain('LocalCustomer');
+ }), function(err, context) {
+ if (err) return done(err);
+ expect(Object.keys(loopback.registry.modelBuilder.models),
+ 'global models')
+ .to.not.contain('LocalCustomer');
+ expect(Object.keys(app.registry.modelBuilder.models), 'local models')
+ .to.contain('LocalCustomer');
+ done();
+ });
});
- it('throws on bad require() call inside boot script', function() {
+ it('throws on bad require() call inside boot script', function(done) {
var file = appdir.writeFileSync('boot/badScript.js',
'require("doesnt-exist"); module.exports = {};');
- function doBoot() {
- boot.execute(app, someInstructions({ bootScripts: [file] }));
- }
-
- expect(doBoot).to.throw(/Cannot find module \'doesnt-exist\'/);
+ boot.execute(app, someInstructions({ bootScripts: [file] }),
+ function(err) {
+ expect(function() {
+ if (err) throw err;
+ }).to.throw(/Cannot find module \'doesnt-exist\'/);
+ done();
+ });
});
- it('instantiates data sources', function() {
- boot.execute(app, dummyInstructions);
- assert(app.dataSources);
- assert(app.dataSources.theDb);
- assertValidDataSource(app.dataSources.theDb);
- assert(app.dataSources.TheDb);
+ it('instantiates data sources', function(done) {
+ boot.execute(app, dummyInstructions, function(err, context) {
+ if (err) return done(err);
+ assert(app.dataSources);
+ assert(app.dataSources.theDb);
+ assertValidDataSource(app.dataSources.theDb);
+ assert(app.dataSources.TheDb);
+ done();
+ });
});
- it('does not call autoAttach', function() {
- boot.execute(app, dummyInstructions);
+ it('does not call autoAttach', function(done) {
+ boot.execute(app, dummyInstructions, function(err, context) {
+ if (err) return done(err);
- // loopback-datasource-juggler quirk:
- // Model.dataSources has modelBuilder as the default value,
- // therefore it's not enough to assert a false-y value
- var actual = loopback.Email.dataSource instanceof loopback.DataSource ?
- 'attached' : 'not attached';
- expect(actual).to.equal('not attached');
+ // loopback-datasource-juggler quirk:
+ // Model.dataSources has modelBuilder as the default value,
+ // therefore it's not enough to assert a false-y value
+ var actual = loopback.Email.dataSource instanceof loopback.DataSource ?
+ 'attached' : 'not attached';
+ expect(actual).to.equal('not attached');
+ done();
+ });
});
- it('skips definition of already defined LoopBack models', function() {
+ it('skips definition of already defined LoopBack models', function(done) {
var builtinModel = {
name: 'User',
definition: fs.readJsonSync(
@@ -245,57 +274,55 @@ describe('executor', function() {
};
builtinModel.definition.redefined = true;
- boot.execute(app, someInstructions({ models: [builtinModel] }));
-
- expect(app.models.User.settings.redefined, 'redefined').to.not.equal(true);
+ boot.execute(app, someInstructions({ models: [builtinModel] }),
+ function(err, context) {
+ if (err) return done(err);
+ expect(app.models.User.settings.redefined,
+ 'redefined').to.not.equal(true);
+ done();
+ });
});
describe('with boot and models files', function() {
- beforeEach(function() {
- boot.execute(app, simpleAppInstructions());
+ beforeEach(function(done) {
+ simpleAppInstructions(function(err, context) {
+ if (err) return done(err);
+ boot.execute(app, context.instructions, done);
+ });
});
afterEach(function() {
delete process.bootFlags;
});
- it('should run `boot/*` files', function(done) {
+ it('should run `boot/*` files', function() {
// scripts are loaded by the order of file names
expect(process.bootFlags).to.eql([
'barLoaded',
'barSyncLoaded',
'fooLoaded',
'barStarted',
+ 'barFinished',
+ 'barSyncExecuted',
]);
-
- // bar finished happens in the next tick
- // barSync executed after bar finished
- setTimeout(function() {
- expect(process.bootFlags).to.eql([
- 'barLoaded',
- 'barSyncLoaded',
- 'fooLoaded',
- 'barStarted',
- 'barFinished',
- 'barSyncExecuted',
- ]);
- done();
- }, 10);
});
});
describe('with boot with callback', function() {
it('should run `boot/*` files asynchronously', function(done) {
- boot.execute(app, simpleAppInstructions(), function() {
- expect(process.bootFlags).to.eql([
- 'barLoaded',
- 'barSyncLoaded',
- 'fooLoaded',
- 'barStarted',
- 'barFinished',
- 'barSyncExecuted',
- ]);
- done();
+ simpleAppInstructions(function(err, context) {
+ if (err) return done(err);
+ boot.execute(app, context.instructions, function() {
+ expect(process.bootFlags).to.eql([
+ 'barLoaded',
+ 'barSyncLoaded',
+ 'fooLoaded',
+ 'barStarted',
+ 'barFinished',
+ 'barSyncExecuted',
+ ]);
+ done();
+ });
});
});
@@ -319,23 +346,30 @@ describe('executor', function() {
};
});
- it('defines mixins from instructions - using `mixinDirs`', function() {
- options.mixinDirs = ['./custom-mixins'];
- boot(app, options);
+ it('defines mixins from instructions - using `mixinDirs`',
+ function(done) {
+ options.mixinDirs = ['./custom-mixins'];
+ boot(app, options, function(err) {
+ if (err) return done(err);
+ var modelBuilder = app.registry.modelBuilder;
+ var registry = modelBuilder.mixins.mixins;
+ expect(Object.keys(registry)).to.eql(['Example', 'Timestamping']);
+ done();
+ });
+ });
- var modelBuilder = app.registry.modelBuilder;
- var registry = modelBuilder.mixins.mixins;
- expect(Object.keys(registry)).to.eql(['Example', 'Timestamping']);
- });
+ it('defines mixins from instructions - using `mixinSources`',
+ function(done) {
+ options.mixinSources = ['./custom-mixins'];
+ boot(app, options, function(err) {
+ if (err) return done(err);
- it('defines mixins from instructions - using `mixinSources`', function() {
- options.mixinSources = ['./custom-mixins'];
- boot(app, options);
-
- var modelBuilder = app.registry.modelBuilder;
- var registry = modelBuilder.mixins.mixins;
- expect(Object.keys(registry)).to.eql(['Example', 'Timestamping']);
- });
+ var modelBuilder = app.registry.modelBuilder;
+ var registry = modelBuilder.mixins.mixins;
+ expect(Object.keys(registry)).to.eql(['Example', 'Timestamping']);
+ done();
+ });
+ });
});
});
@@ -357,41 +391,51 @@ describe('executor', function() {
delete process.env.npm_package_config_port;
});
- function bootWithDefaults() {
+ function bootWithDefaults(done) {
app = loopback();
boot.execute(app, someInstructions({
application: {
port: undefined,
host: undefined,
},
- }));
+ }), done);
}
- it('should apply env passed in option object', function() {
- boot.execute(app, someInstructions({ env: 'custom_env' }));
- expect(app.get('env')).to.equal('custom_env');
+ it('should apply env passed in option object', function(done) {
+ boot.execute(app, someInstructions({ env: 'custom_env' }), function(err) {
+ if (err) return done(err);
+ expect(app.get('env')).to.equal('custom_env');
+ done();
+ });
});
- it('should honor host and port', function() {
- function assertHonored(portKey, hostKey) {
+ it('should honor host and port', function(done) {
+ function assertHonored(portKey, hostKey, done) {
process.env[hostKey] = randomPort();
process.env[portKey] = randomHost();
- bootWithDefaults();
- assert.equal(app.get('port'), process.env[portKey], portKey);
- assert.equal(app.get('host'), process.env[hostKey], hostKey);
- delete process.env[portKey];
- delete process.env[hostKey];
+ bootWithDefaults(function(err) {
+ if (err) return done(err);
+ assert.equal(app.get('port'), process.env[portKey], portKey);
+ assert.equal(app.get('host'), process.env[hostKey], hostKey);
+ delete process.env[portKey];
+ delete process.env[hostKey];
+ done();
+ });
}
- assertHonored('OPENSHIFT_SLS_PORT', 'OPENSHIFT_NODEJS_IP');
- assertHonored('npm_config_port', 'npm_config_host');
- assertHonored('npm_package_config_port', 'npm_package_config_host');
- assertHonored('OPENSHIFT_SLS_PORT', 'OPENSHIFT_SLS_IP');
- assertHonored('VCAP_APP_PORT', 'VCAP_APP_HOST');
- assertHonored('PORT', 'HOST');
+ async.eachSeries([
+ { port: 'OPENSHIFT_SLS_PORT', host: 'OPENSHIFT_NODEJS_IP' },
+ { port: 'npm_config_port', host: 'npm_config_host' },
+ { port: 'npm_package_config_port', host: 'npm_package_config_host' },
+ { port: 'OPENSHIFT_SLS_PORT', host: 'OPENSHIFT_SLS_IP' },
+ { port: 'VCAP_APP_PORT', host: 'VCAP_APP_HOST' },
+ { port: 'PORT', host: 'HOST' },
+ ], function(config, done) {
+ assertHonored(config.port, config.host, done);
+ }, done);
});
- it('should prioritize host sources', function() {
+ it('should prioritize host sources', function(done) {
// jscs:disable requireCamelCaseOrUpperCaseIdentifiers
/*eslint-disable camelcase*/
process.env.npm_config_host = randomHost();
@@ -401,12 +445,15 @@ describe('executor', function() {
process.env.HOST = randomHost();
process.env.npm_package_config_host = randomHost();
- bootWithDefaults();
- assert.equal(app.get('host'), process.env.npm_config_host);
- /*eslint-enable camelcase*/
+ bootWithDefaults(function(err) {
+ if (err) return done(err);
+ assert.equal(app.get('host'), process.env.npm_config_host);
+ /*eslint-enable camelcase*/
+ done();
+ });
});
- it('should prioritize port sources', function() {
+ it('should prioritize port sources', function(done) {
/*eslint-disable camelcase*/
process.env.npm_config_port = randomPort();
process.env.OPENSHIFT_SLS_PORT = randomPort();
@@ -415,9 +462,12 @@ describe('executor', function() {
process.env.PORT = randomPort();
process.env.npm_package_config_port = randomPort();
- bootWithDefaults();
- assert.equal(app.get('port'), process.env.npm_config_port);
- /*eslint-enable camelcase*/
+ bootWithDefaults(function(err) {
+ if (err) return done(err);
+ assert.equal(app.get('port'), process.env.npm_config_port);
+ /*eslint-enable camelcase*/
+ done();
+ });
});
function randomHost() {
@@ -428,25 +478,37 @@ describe('executor', function() {
return Math.floor(Math.random() * 10000);
}
- it('should honor 0 for free port', function() {
- boot.execute(app, someInstructions({ application: { port: 0 }}));
- assert.equal(app.get('port'), 0);
+ it('should honor 0 for free port', function(done) {
+ boot.execute(app, someInstructions({ application: { port: 0 }}),
+ function(err) {
+ if (err) return done(err);
+ assert.equal(app.get('port'), 0);
+ done();
+ });
});
- it('should default to port 3000', function() {
- boot.execute(app, someInstructions({ application: { port: undefined }}));
- assert.equal(app.get('port'), 3000);
+ it('should default to port 3000', function(done) {
+ boot.execute(app, someInstructions({ application: { port: undefined }}),
+ function(err) {
+ if (err) return done(err);
+ assert.equal(app.get('port'), 3000);
+ done();
+ });
});
- it('should respect named pipes port values in ENV', function() {
+ it('should respect named pipes port values in ENV', function(done) {
var NAMED_PORT = '\\.\\pipe\\test';
process.env.PORT = NAMED_PORT;
- boot.execute(app, someInstructions({ application: { port: 3000 }}));
- assert.equal(app.get('port'), NAMED_PORT);
+ boot.execute(app, someInstructions({ application: { port: 3000 }}),
+ function(err) {
+ if (err) return done(err);
+ assert.equal(app.get('port'), NAMED_PORT);
+ done();
+ });
});
});
- describe('with middleware.json', function() {
+ describe('with middleware.json', function(done) {
beforeEach(function() {
delete process.env.restApiRoot;
});
@@ -454,12 +516,14 @@ describe('executor', function() {
it('should parse a simple config variable', function(done) {
boot.execute(app, simpleMiddlewareConfig('routes',
{ path: '${restApiRoot}' }
- ));
-
- supertest(app).get('/').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.path).to.equal(app.get('restApiRoot'));
- done();
+
+ supertest(app).get('/').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.path).to.equal(app.get('restApiRoot'));
+ done();
+ });
});
});
@@ -467,134 +531,154 @@ describe('executor', function() {
process.env.restApiRoot = '/url-from-env-var';
boot.execute(app, simpleMiddlewareConfig('routes',
{ path: '${restApiRoot}' }
- ));
-
- supertest(app).get('/url-from-env-var').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.path).to.equal('/url-from-env-var');
- done();
+
+ supertest(app).get('/url-from-env-var').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.path).to.equal('/url-from-env-var');
+ done();
+ });
});
});
it('dynamic variable from `env var` should have' +
- ' precedence over app.get()', function(done) {
+ ' precedence over app.get()', function(done) {
process.env.restApiRoot = '/url-from-env-var';
var bootInstructions;
bootInstructions = simpleMiddlewareConfig('routes',
{ path: '${restApiRoot}' });
bootInstructions.application = { restApiRoot: '/url-from-config' };
- boot.execute(app, someInstructions(bootInstructions));
-
- supertest(app).get('/url-from-env-var').end(function(err, res) {
+ boot.execute(app, someInstructions(bootInstructions), function(err) {
if (err) return done(err);
- expect(app.get('restApiRoot')).to.equal('/url-from-config');
- expect(res.body.path).to.equal('/url-from-env-var');
- done();
+
+ supertest(app).get('/url-from-env-var').end(function(err, res) {
+ if (err) return done(err);
+ expect(app.get('restApiRoot')).to.equal('/url-from-config');
+ expect(res.body.path).to.equal('/url-from-env-var');
+ done();
+ });
});
});
it('should parse multiple config variables', function(done) {
boot.execute(app, simpleMiddlewareConfig('routes',
{ path: '${restApiRoot}', env: '${env}' }
- ));
-
- supertest(app).get('/').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.path).to.equal(app.get('restApiRoot'));
- expect(res.body.env).to.equal(app.get('env'));
- done();
+
+ supertest(app).get('/').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.path).to.equal(app.get('restApiRoot'));
+ expect(res.body.env).to.equal(app.get('env'));
+ done();
+ });
});
});
it('should parse config variables in an array', function(done) {
boot.execute(app, simpleMiddlewareConfig('routes',
{ paths: ['${restApiRoot}'] }
- ));
-
- supertest(app).get('/').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.paths).to.eql(
- [app.get('restApiRoot')]
+
+ supertest(app).get('/').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.paths).to.eql(
+ [app.get('restApiRoot')]
);
- done();
+ done();
+ });
});
});
it('should parse config variables in an object', function(done) {
boot.execute(app, simpleMiddlewareConfig('routes',
{ info: { path: '${restApiRoot}' }}
- ));
-
- supertest(app).get('/').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.info).to.eql({
- path: app.get('restApiRoot'),
+
+ supertest(app).get('/').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.info).to.eql({
+ path: app.get('restApiRoot'),
+ });
+ done();
});
- done();
});
});
it('should parse config variables in a nested object', function(done) {
boot.execute(app, simpleMiddlewareConfig('routes',
{ nested: { info: { path: '${restApiRoot}' }}}
- ));
-
- supertest(app).get('/').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.nested).to.eql({
- info: { path: app.get('restApiRoot') },
+
+ supertest(app).get('/').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.nested).to.eql({
+ info: { path: app.get('restApiRoot') },
+ });
+ done();
});
- done();
});
});
it('should parse config variables with null values', function(done) {
boot.execute(app, simpleMiddlewareConfig('routes',
{ nested: { info: { path: '${restApiRoot}', some: null }}}
- ));
-
- supertest(app).get('/').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.nested).to.eql({
- info: {
- path: app.get('restApiRoot'),
- some: null,
- },
+
+ supertest(app).get('/').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.nested).to.eql({
+ info: {
+ path: app.get('restApiRoot'),
+ some: null,
+ },
+ });
+ done();
});
- done();
});
});
it('should not parse invalid config variables', function(done) {
- var invalidDataTypes = [undefined, function() {}];
+ var invalidDataTypes = [undefined, function() {
+ }];
async.each(invalidDataTypes, function(invalidDataType, cb) {
var config = simpleMiddlewareConfig('routes', {
path: invalidDataType,
});
- boot.execute(app, config);
+ boot.execute(app, config, function(err) {
+ if (err) return done(err);
- supertest(app)
- .get('/')
- .end(function(err, res) {
- expect(err).to.be.null;
- expect(res.body.path).to.be.undefined;
- cb();
- });
+ supertest(app)
+ .get('/')
+ .end(function(err, res) {
+ expect(err).to.be.null;
+ expect(res.body.path).to.be.undefined;
+ cb();
+ });
+ }, cb);
}, done);
});
it('should parse valid config variables', function(done) {
var config = simpleMiddlewareConfig('routes', {
- props: ['a', '${vVar}', 1, true, function() {}, { x: 1, y: '${y}' }],
+ props: ['a', '${vVar}', 1, true, function() {
+ }, { x: 1, y: '${y}' }],
});
- boot.execute(app, config);
+ boot.execute(app, config, function(err) {
+ if (err) return done(err);
- supertest(app)
- .get('/')
- .end(function(err, res) {
- expect(err).to.be.null;
- done();
- });
+ supertest(app)
+ .get('/')
+ .end(function(err, res) {
+ expect(err).to.be.null;
+ done();
+ });
+ });
});
it('should preserve object prototypes', function(done) {
@@ -603,11 +687,13 @@ describe('executor', function() {
// IMPORTANT we need more than one item to trigger the original issue
[/^\/foobar/, /^\/another/],
{});
- boot.execute(app, config);
+ boot.execute(app, config, function(err) {
+ if (err) return done(err);
- supertest(app).get('/foobar')
- .expect(200)
- .end(done);
+ supertest(app).get('/foobar')
+ .expect(200)
+ .end(done);
+ });
});
});
@@ -620,12 +706,14 @@ describe('executor', function() {
it('should parse a simple config variable', function(done) {
boot.execute(app, simpleComponentConfig(
{ path: '${restApiRoot}' }
- ));
-
- supertest(app).get('/component').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.path).to.equal(app.get('restApiRoot'));
- done();
+
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.path).to.equal(app.get('restApiRoot'));
+ done();
+ });
});
});
@@ -643,12 +731,14 @@ describe('executor', function() {
// result should get value from env var
process.env.DYNAMIC_ENVVAR = 'FOOBAR-ENVVAR';
- boot.execute(app, bootInstructions);
- supertest(app).get('/component').end(function(err, res) {
+ boot.execute(app, bootInstructions, function(err) {
if (err) return done(err);
- expect(res.body.fromConfig).to.equal('FOOBAR-CONFIG');
- expect(res.body.fromEnvVar).to.equal('FOOBAR-ENVVAR');
- done();
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.fromConfig).to.equal('FOOBAR-CONFIG');
+ expect(res.body.fromEnvVar).to.equal('FOOBAR-ENVVAR');
+ done();
+ });
});
});
@@ -661,66 +751,76 @@ describe('executor', function() {
bootInstructions.application[key] = 'should be overwritten';
process.env[key] = 'successfully overwritten';
- boot.execute(app, bootInstructions);
- supertest(app).get('/component').end(function(err, res) {
+ boot.execute(app, bootInstructions, function(err) {
if (err) return done(err);
- expect(res.body.isDynamic).to.equal('successfully overwritten');
- done();
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.isDynamic).to.equal('successfully overwritten');
+ done();
+ });
});
});
it('should parse multiple config variables', function(done) {
boot.execute(app, simpleComponentConfig(
{ path: '${restApiRoot}', env: '${env}' }
- ));
-
- supertest(app).get('/component').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.path).to.equal(app.get('restApiRoot'));
- expect(res.body.env).to.equal(app.get('env'));
- done();
+
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.path).to.equal(app.get('restApiRoot'));
+ expect(res.body.env).to.equal(app.get('env'));
+ done();
+ });
});
});
it('should parse config variables in an array', function(done) {
boot.execute(app, simpleComponentConfig(
{ paths: ['${restApiRoot}'] }
- ));
-
- supertest(app).get('/component').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.paths).to.eql(
- [app.get('restApiRoot')]
+
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.paths).to.eql(
+ [app.get('restApiRoot')]
);
- done();
+ done();
+ });
});
});
it('should parse config variables in an object', function(done) {
boot.execute(app, simpleComponentConfig(
{ info: { path: '${restApiRoot}' }}
- ));
-
- supertest(app).get('/component').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.info).to.eql({
- path: app.get('restApiRoot'),
+
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.info).to.eql({
+ path: app.get('restApiRoot'),
+ });
+ done();
});
- done();
});
});
it('should parse config variables in a nested object', function(done) {
boot.execute(app, simpleComponentConfig(
{ nested: { info: { path: '${restApiRoot}' }}}
- ));
-
- supertest(app).get('/component').end(function(err, res) {
+ ), function(err) {
if (err) return done(err);
- expect(res.body.nested).to.eql({
- info: { path: app.get('restApiRoot') },
+
+ supertest(app).get('/component').end(function(err, res) {
+ if (err) return done(err);
+ expect(res.body.nested).to.eql({
+ info: { path: app.get('restApiRoot') },
+ });
+ done();
});
- done();
});
});
});
@@ -730,8 +830,12 @@ describe('executor', function() {
'module.exports = function(app) { app.fnCalled = true; };');
delete app.fnCalled;
- boot.execute(app, someInstructions({ bootScripts: [file] }));
- expect(app.fnCalled, 'exported fn was called').to.be.true;
+ boot.execute(app, someInstructions({ bootScripts: [file] }),
+ function(err) {
+ if (err) return done(err);
+ expect(app.fnCalled, 'exported fn was called').to.be.true;
+ done();
+ });
});
it('configures middleware', function(done) {
@@ -772,16 +876,18 @@ describe('executor', function() {
},
],
},
- }));
+ }), function(err) {
+ if (err) return done(err);
- supertest(app)
- .get('/')
- .end(function(err, res) {
- if (err) return done(err);
- var names = (res.headers.names || '').split(',');
- expect(names).to.eql(['initial', 'custom', 'routes']);
- done();
- });
+ supertest(app)
+ .get('/')
+ .end(function(err, res) {
+ if (err) return done(err);
+ var names = (res.headers.names || '').split(',');
+ expect(names).to.eql(['initial', 'custom', 'routes']);
+ done();
+ });
+ });
});
it('configures middleware using shortform', function(done) {
@@ -798,30 +904,38 @@ describe('executor', function() {
},
],
},
- }));
+ }), function(err) {
+ if (err) return done(err);
- supertest(app)
- .get('/')
- .end(function(err, res) {
- if (err) return done(err);
- expect(res.text).to.eql(('\n\n\n' +
+ supertest(app)
+ .get('/')
+ .end(function(err, res) {
+ if (err) return done(err);
+ expect(res.text).to.eql((
+ '\n\n\n' +
' \n simple-app\n' +
'\n\nsimple-app
\n' +
'\n').replace(/\n/g, os.EOL));
- done();
- });
+ done();
+ });
+ });
});
it('configures middleware (end-to-end)', function(done) {
- boot.execute(app, simpleAppInstructions());
-
- supertest(app)
- .get('/')
- .end(function(err, res) {
+ simpleAppInstructions(function(err, context) {
+ if (err) return done(err);
+ boot.execute(app, context.instructions, function(err) {
if (err) return done(err);
- expect(res.headers.names).to.equal('custom-middleware');
- done();
+
+ supertest(app)
+ .get('/')
+ .end(function(err, res) {
+ if (err) return done(err);
+ expect(res.headers.names).to.equal('custom-middleware');
+ done();
+ });
});
+ });
});
it('configures components', function() {
@@ -835,12 +949,14 @@ describe('executor', function() {
'module.exports = ' +
'function(app, options) { app.componentOptions = options; }');
- boot(app, appdir.PATH);
+ boot(app, appdir.PATH, function(err) {
+ if (err) return done(err);
- expect(Object.keys(require.cache)).to.include(
- appdir.resolve('components/test-component/index.js'));
+ expect(Object.keys(require.cache)).to.include(
+ appdir.resolve('components/test-component/index.js'));
- expect(app.componentOptions).to.eql({ option: 'value' });
+ expect(app.componentOptions).to.eql({ option: 'value' });
+ });
});
it('disables component when configuration is not set', function() {
@@ -852,10 +968,12 @@ describe('executor', function() {
'module.exports = ' +
'function(app, options) { app.componentOptions = options; }');
- boot(app, appdir.PATH);
+ boot(app, appdir.PATH, function(err) {
+ if (err) return done(err);
- expect(Object.keys(require.cache)).to.not.include(
- appdir.resolve('components/test-component/index.js'));
+ expect(Object.keys(require.cache)).to.not.include(
+ appdir.resolve('components/test-component/index.js'));
+ });
});
it('disable component if overrided by production configuration', function() {
@@ -870,10 +988,12 @@ describe('executor', function() {
'module.exports = ' +
'function(app, options) { app.componentOptions = options; }');
- boot(app, { appRootDir: appdir.PATH, env: 'production' });
+ boot(app, { appRootDir: appdir.PATH, env: 'production' }, function(err) {
+ if (err) return done(err);
- expect(Object.keys(require.cache)).to.not.include(
- appdir.resolve('components/test-component/index.js'));
+ expect(Object.keys(require.cache)).to.not.include(
+ appdir.resolve('components/test-component/index.js'));
+ });
});
it('configures middleware (that requires `this`)', function(done) {
@@ -892,21 +1012,26 @@ describe('executor', function() {
},
],
},
- }));
+ }), function(err) {
+ if (err) return done(err);
- supertest(app)
- .get('/')
- .expect('passport', 'initialized', done);
+ supertest(app)
+ .get('/')
+ .expect('passport', 'initialized', done);
+ });
});
describe('when booting with env', function() {
it('should set the `booting` flag during execution', function(done) {
expect(app.booting).to.be.undefined;
- boot.execute(app, envAppInstructions(), function(err) {
+ envAppInstructions(function(err, context) {
if (err) return done(err);
- expect(app.booting).to.be.false;
- expect(process.bootFlags).to.not.have.property('barLoadedInTest');
- done();
+ boot.execute(app, context.instructions, function(err) {
+ if (err) return done(err);
+ expect(app.booting).to.be.false;
+ expect(process.bootFlags).to.not.have.property('barLoadedInTest');
+ done();
+ });
});
});
});
@@ -1114,16 +1239,16 @@ function someInstructions(values) {
return result;
}
-function simpleAppInstructions() {
+function simpleAppInstructions(done) {
// Copy it so that require will happend again
fs.copySync(SIMPLE_APP, appdir.PATH);
- return boot.compile(appdir.PATH);
+ boot.compile(appdir.PATH, done);
}
-function envAppInstructions() {
+function envAppInstructions(done) {
fs.copySync(ENV_APP, appdir.PATH);
- return boot.compile({
+ boot.compile({
appRootDir: appdir.PATH,
env: 'test',
- });
+ }, done);
}
diff --git a/test/fixtures/browser-app-2/app.js b/test/fixtures/browser-app-2/app.js
index d6ba5d3..16ba90e 100644
--- a/test/fixtures/browser-app-2/app.js
+++ b/test/fixtures/browser-app-2/app.js
@@ -7,8 +7,10 @@ var loopback = require('loopback');
var boot = require('../../../');
var app = module.exports = loopback();
+app.start = function(done) {
+ boot(app, {
+ appId: 'browserApp2',
+ appRootDir: __dirname,
+ }, done);
+};
-boot(app, {
- appId: 'browserApp2',
- appRootDir: __dirname,
-});
diff --git a/test/fixtures/browser-app/app.js b/test/fixtures/browser-app/app.js
index f2c4fb6..64c54ff 100644
--- a/test/fixtures/browser-app/app.js
+++ b/test/fixtures/browser-app/app.js
@@ -7,4 +7,6 @@ var loopback = require('loopback');
var boot = require('../../../');
var app = module.exports = loopback();
-boot(app);
+app.start = function(done) {
+ boot(app, __dirname, done);
+};
diff --git a/test/fixtures/coffee-app/app.coffee b/test/fixtures/coffee-app/app.coffee
index 2c0b8dd..d4c7b92 100644
--- a/test/fixtures/coffee-app/app.coffee
+++ b/test/fixtures/coffee-app/app.coffee
@@ -2,4 +2,5 @@ loopback = require 'loopback'
boot = require '../../../'
module.exports = client = loopback()
-boot(client)
+client.start = (done) ->
+ boot(client, __dirname, done)