Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 14:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolved #1350

Browse Source
This commit is contained in:
Julian Lam
2014-04-08 16:52:50 -04:00
parent 3378717562
commit 1cc15a71d6
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app.js
View File

@@ -88,7 +88,10 @@ function loadConfig() {
});
nconf.defaults({
themes_path: path.join(__dirname, 'node_modules')
base_dir: __dirname,
themes_path: path.join(__dirname, 'node_modules'),
upload_url: path.join(path.sep, 'uploads', path.sep),
views_dir: path.join(__dirname, 'public/templates')
});
// Ensure themes_path is a full filepath
@@ -98,11 +101,6 @@ function loadConfig() {
function start() {
loadConfig();
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('upload_url', path.join(path.sep, 'uploads', path.sep));
nconf.set('base_dir', __dirname);
nconf.set('views_dir', path.join(__dirname, 'public/templates'));
winston.info('Time: ' + new Date());
winston.info('Initializing NodeBB v' + pkg.version);
winston.info('* using configuration stored in: ' + configFile);
@@ -133,6 +131,7 @@ function start() {
plugins.init();
translator.loadServer();
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
nconf.set('theme_templates_path', meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : nconf.get('base_templates_path'));

10
mocks/databasemock.js
View File

@@ -14,6 +14,12 @@
nconf.file({ file: path.join(__dirname, '../config.json') });
nconf.defaults({
base_dir: path.join(__dirname,'..'),
themes_path: path.join(__dirname, '../node_modules'),
upload_url: path.join(path.sep, '../uploads', path.sep),
views_dir: path.join(__dirname, '../public/templates')
});
var dbType = nconf.get('database'),
testDbConfig = nconf.get('test_database'),
@@ -59,7 +65,6 @@
meta = require('../src/meta');
before(function(done) {
db.init(function(err) {
//Clean up
db.flushdb(function(err) {
@@ -71,6 +76,9 @@
winston.info('test_database flushed');
meta.configs.init(function () {
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates'));
nconf.set('theme_templates_path', meta.config['theme:templates'] ? path.join(nconf.get('themes_path'), meta.config['theme:id'], meta.config['theme:templates']) : nconf.get('base_templates_path'));
var webserver = require('../src/webserver'),
sockets = require('../src/socket.io');

1
tests/groups.js
View File

@@ -95,7 +95,6 @@ describe('Groups', function() {
Groups.search('hidden', {
showAllGroups: true
}, function(err, groups) {
console.log(groups);
assert.equal(1, groups.length);
assert.strictEqual('Hidden', groups[0].name);
done();