Only load necessary plugin data

Fix tests to work in this case
Add more verbose messages to plugins/data
This commit is contained in:
Peter Jaszkowiak
2017-05-18 01:32:20 -06:00
parent b0645cc67d
commit 90da6d889d
6 changed files with 92 additions and 50 deletions

View File

@@ -5,6 +5,10 @@ var assert = require('assert');
var db = require('./mocks/databasemock');
describe('Build', function () {
before(function (done) {
db.setupMockDefaults(done);
});
it('should build all assets', function (done) {
this.timeout(50000);
var build = require('../src/meta/build');
@@ -13,4 +17,8 @@ describe('Build', function () {
done();
});
});
after(function (done) {
db.emptydb(done);
});
});

View File

@@ -83,42 +83,19 @@
before(function (done) {
this.timeout(30000);
var meta;
async.waterfall([
async.series([
function (next) {
db.init(next);
},
function (next) {
db.emptydb(next);
},
function (next) {
winston.info('test_database flushed');
meta = require('../../src/meta');
setupDefaultConfigs(meta, next);
},
function (next) {
meta.configs.init(next);
setupMockDefaults(next);
},
function (next) {
db.initSessionStore(next);
},
function (next) {
meta.dependencies.check(next);
},
function (next) {
meta.config.postDelay = 0;
meta.config.initialPostDelay = 0;
meta.config.newbiePostDelay = 0;
var meta = require('../../src/meta');
enableDefaultPlugins(next);
},
function (next) {
meta.themes.set({
type: 'local',
id: 'nodebb-theme-persona',
}, next);
},
function (next) {
// nconf defaults, if not set in config
if (!nconf.get('sessionKey')) {
nconf.set('sessionKey', 'express.sid');
@@ -154,6 +131,40 @@
], done);
});
function setupMockDefaults(callback) {
var meta = require('../../src/meta');
async.series([
function (next) {
db.emptydb(next);
},
function (next) {
winston.info('test_database flushed');
setupDefaultConfigs(meta, next);
},
function (next) {
meta.configs.init(next);
},
function (next) {
meta.dependencies.check(next);
},
function (next) {
meta.config.postDelay = 0;
meta.config.initialPostDelay = 0;
meta.config.newbiePostDelay = 0;
enableDefaultPlugins(next);
},
function (next) {
meta.themes.set({
type: 'local',
id: 'nodebb-theme-persona',
}, next);
},
], callback);
}
db.setupMockDefaults = setupMockDefaults;
function setupDefaultConfigs(meta, next) {
winston.info('Populating database with default configs, if not already set...\n');

View File

@@ -16,7 +16,6 @@ describe('Plugins', function () {
assert.ifError(err);
assert(plugins.libraries[pluginId]);
assert(plugins.loadedHooks['static:app.load']);
assert(plugins.staticDirs['nodebb-plugin-markdown/js']);
done();
});