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

more test fixes

Browse Source
This commit is contained in:
barisusakli
2016-10-16 21:51:42 +03:00
parent 15d948894d
commit 1a63672e66
11 changed files with 65 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/mongo/sorted.js
View File

@@ -19,7 +19,7 @@ module.exports = function (db, module) {
db.collection('objects').update({_key: key, value: value}, {$set: {score: parseInt(score, 10)}}, {upsert:true, w: 1}, function (err) { db.collection('objects').update({_key: key, value: value}, {$set: {score: parseInt(score, 10)}}, {upsert:true, w: 1}, function (err) {
if (err && err.message.startsWith('E11000 duplicate key error')) { if (err && err.message.startsWith('E11000 duplicate key error')) {
return module.sortedSetAdd(key, score, value, callback); return process.nextTick(module.sortedSetAdd, key, score, value, callback);
} }
callback(err); callback(err);
}); });
@@ -572,7 +572,7 @@ module.exports = function (db, module) {
// https://jira.mongodb.org/browse/SERVER-14322 // https://jira.mongodb.org/browse/SERVER-14322
// https://docs.mongodb.org/manual/reference/command/findAndModify/#upsert-and-unique-index // https://docs.mongodb.org/manual/reference/command/findAndModify/#upsert-and-unique-index
if (err && err.message.startsWith('E11000 duplicate key error')) { if (err && err.message.startsWith('E11000 duplicate key error')) {
return module.sortedSetIncrBy(key, increment, value, callback); return process.nextTick(module.sortedSetIncrBy, key, increment, value, callback);
} }
callback(err, result && result.value ? result.value.score : null); callback(err, result && result.value ? result.value.score : null);
}); });

8
src/routes/index.js
View File

@@ -1,6 +1,7 @@
"use strict"; "use strict";
var nconf = require('nconf'); var nconf = require('nconf');
var winston = require('winston');
var path = require('path'); var path = require('path');
var async = require('async'); var async = require('async');
var controllers = require('../controllers'); var controllers = require('../controllers');
@@ -157,5 +158,10 @@ module.exports = function (app, middleware, hotswapIds) {
async.apply(plugins.reloadRoutes), async.apply(plugins.reloadRoutes),
async.apply(authRoutes.reloadRoutes), async.apply(authRoutes.reloadRoutes),
async.apply(user.addInterstitials) async.apply(user.addInterstitials)
]); ], function (err) {
if (err) {
return winston.error(err);
}
winston.info('Routes added');
});
}; };

6
src/socket.io/index.js
View File

@@ -1,12 +1,10 @@
"use strict"; "use strict";
var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')();
var async = require('async'); var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var cookieParser = require('cookie-parser')(nconf.get('secret'));
var winston = require('winston'); var winston = require('winston');
var url = require('url'); var url = require('url');
var cookieParser = require('cookie-parser')(nconf.get('secret'));
var db = require('../database'); var db = require('../database');
var logger = require('../logger'); var logger = require('../logger');
@@ -19,6 +17,8 @@ var ratelimit = require('../middleware/ratelimit');
Sockets.init = function (server) { Sockets.init = function (server) {
requireModules(); requireModules();
var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')();
io = new SocketIO({ io = new SocketIO({
path: nconf.get('relative_path') + '/socket.io' path: nconf.get('relative_path') + '/socket.io'
}); });

25
src/webserver.js
View File

@@ -65,6 +65,7 @@ module.exports.listen = function (callback) {
emitter.all(['templates:compiled', 'meta:js.compiled', 'meta:css.compiled'], function () { emitter.all(['templates:compiled', 'meta:js.compiled', 'meta:css.compiled'], function () {
winston.info('NodeBB Ready'); winston.info('NodeBB Ready');
emitter.emit('nodebb:ready'); emitter.emit('nodebb:ready');
listen(callback); listen(callback);
}); });
@@ -100,6 +101,19 @@ function initializeNodeBB(callback) {
}, },
async.apply(plugins.fireHook, 'static:assets.prepare', {}), async.apply(plugins.fireHook, 'static:assets.prepare', {}),
async.apply(meta.js.bridgeModules, app), async.apply(meta.js.bridgeModules, app),
function (next) {
plugins.fireHook('static:app.preload', {
app: app,
middleware: middleware
}, next);
},
function (next) {
plugins.fireHook('filter:hotswap.prepare', [], next);
},
function (hotswapIds, next) {
routes(app, middleware, hotswapIds);
next();
},
function (next) { function (next) {
async.series([ async.series([
async.apply(meta.templates.compile), async.apply(meta.templates.compile),
@@ -110,17 +124,6 @@ function initializeNodeBB(callback) {
async.apply(languages.init), async.apply(languages.init),
async.apply(meta.blacklist.load) async.apply(meta.blacklist.load)
], next); ], next);
},
function (results, next) {
plugins.fireHook('static:app.preload', {
app: app,
middleware: middleware
}, next);
},
async.apply(plugins.fireHook, 'filter:hotswap.prepare', []),
function (hotswapIds, next) {
routes(app, middleware, hotswapIds);
next();
} }
], callback); ], callback);
} }

18
test/authentication.js
View File

@@ -2,21 +2,17 @@
/*global require, before*/ /*global require, before*/
var assert = require('assert'); var assert = require('assert');
var async = require('async');
var nconf = require('nconf'); var nconf = require('nconf');
var request = require('request'); var request = require('request');
var db = require('./mocks/databasemock'); var db = require('./mocks/databasemock');
var user = require('../src/user');
describe('authentication', function () { describe('authentication', function () {
var jar = request.jar(); var jar = request.jar();
before(function (done) { before(function (done) {
request({ user.create({username: 'regular', password: 'regularpwd', email: 'regular@nodebb.org' }, function (err) {
url: nconf.get('url') + '/api/config',
json: true,
jar: jar
}, function (err, response, body) {
assert.ifError(err); assert.ifError(err);
done(); done();
}); });
@@ -54,7 +50,7 @@ describe('authentication', function () {
assert(body); assert(body);
assert.equal(body.username, 'admin'); assert.equal(body.username, 'admin');
assert.equal(body.email, 'admin@nodebb.org'); assert.equal(body.email, 'admin@nodebb.org');
done() done();
}); });
}); });
}); });
@@ -102,8 +98,8 @@ describe('authentication', function () {
request.post(nconf.get('url') + '/login', { request.post(nconf.get('url') + '/login', {
form: { form: {
username: 'admin', username: 'regular',
password: 'adminpwd', password: 'regularpwd',
}, },
json: true, json: true,
jar: jar, jar: jar,
@@ -121,8 +117,8 @@ describe('authentication', function () {
}, function (err, response, body) { }, function (err, response, body) {
assert.ifError(err); assert.ifError(err);
assert(body); assert(body);
assert.equal(body.username, 'admin'); assert.equal(body.username, 'regular');
assert.equal(body.email, 'admin@nodebb.org'); assert.equal(body.email, 'regular@nodebb.org');
done() done()
}); });
}); });

14
test/messaging.js
View File

@@ -1,13 +1,13 @@
'use strict'; 'use strict';
/*global require, before, after*/ /*global require, before, after*/
var assert = require('assert'), var assert = require('assert');
db = require('./mocks/databasemock'), var db = require('./mocks/databasemock');
async = require('async'), var async = require('async');
User = require('../src/user'), var User = require('../src/user');
Groups = require('../src/groups'), var Groups = require('../src/groups');
Messaging = require('../src/messaging'), var Messaging = require('../src/messaging');
testUids; var testUids;
describe('Messaging Library', function () { describe('Messaging Library', function () {
before(function (done) { before(function (done) {

4
test/mocks/databasemock.js
View File

@@ -12,7 +12,6 @@
var path = require('path'); var path = require('path');
var nconf = require('nconf'); var nconf = require('nconf');
var url = require('url'); var url = require('url');
var winston = require('winston');
var errorText; var errorText;
@@ -82,10 +81,10 @@
winston.info(testDbConfig); winston.info(testDbConfig);
var db = require('../../src/database'); var db = require('../../src/database');
var meta = require('../../src/meta');
before(function (done) { before(function (done) {
this.timeout(30000); this.timeout(30000);
var meta;
async.waterfall([ async.waterfall([
function (next) { function (next) {
db.init(next); db.init(next);
@@ -95,6 +94,7 @@
}, },
function (next) { function (next) {
winston.info('test_database flushed'); winston.info('test_database flushed');
meta = require('../../src/meta');
meta.configs.init(next); meta.configs.init(next);
}, },
function (next) { function (next) {

1
test/plugins.js
View File

@@ -17,7 +17,6 @@ describe('Plugins', function () {
assert(plugins.libraries[pluginId]); assert(plugins.libraries[pluginId]);
assert(plugins.loadedHooks['static:app.load']); assert(plugins.loadedHooks['static:app.load']);
assert(plugins.staticDirs['nodebb-plugin-markdown/js']); assert(plugins.staticDirs['nodebb-plugin-markdown/js']);
assert.notEqual(plugins.lessFiles.indexOf('nodebb-plugin-markdown/public/less/default.less'), -1);
done(); done();
}); });

4
test/socket.io.js
View File

@@ -19,11 +19,10 @@ var groups = require('../src/groups');
describe('socket.io', function () { describe('socket.io', function () {
var adminUid;
var io; var io;
before(function (done) { before(function (done) {
async.parallel([ async.series([
async.apply(user.create, { username: 'admin', password: 'adminpwd' }), async.apply(user.create, { username: 'admin', password: 'adminpwd' }),
async.apply(user.create, { username: 'regular', password: 'regularpwd' }) async.apply(user.create, { username: 'regular', password: 'regularpwd' })
], function (err, uids) { ], function (err, uids) {
@@ -31,7 +30,6 @@ describe('socket.io', function () {
return done(err); return done(err);
} }
adminUid = uids[0];
groups.join('administrators', uids[0], done); groups.join('administrators', uids[0], done);
}); });
}); });

22
test/translator.js
View File

@@ -21,7 +21,7 @@ describe('translator shim', function (){
describe('new Translator(language)', function (){ describe('new Translator(language)', function (){
describe('.translate()', function (){ describe('.translate()', function (){
it('should handle basic translations', function (done) { it('should handle basic translations', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[global:home]]').then(function (translated) { translator.translate('[[global:home]]').then(function (translated) {
assert.strictEqual(translated, 'Home'); assert.strictEqual(translated, 'Home');
@@ -30,7 +30,7 @@ describe('new Translator(language)', function (){
}); });
it('should handle language keys in regular text', function (done) { it('should handle language keys in regular text', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('Let\'s go [[global:home]]').then(function (translated) { translator.translate('Let\'s go [[global:home]]').then(function (translated) {
assert.strictEqual(translated, 'Let\'s go Home'); assert.strictEqual(translated, 'Let\'s go Home');
@@ -39,7 +39,7 @@ describe('new Translator(language)', function (){
}); });
it('should accept a language parameter and adjust accordingly', function (done) { it('should accept a language parameter and adjust accordingly', function (done) {
var translator = new Translator('de'); var translator = new Translator('de');
translator.translate('[[global:home]]').then(function (translated) { translator.translate('[[global:home]]').then(function (translated) {
assert.strictEqual(translated, 'Übersicht'); assert.strictEqual(translated, 'Übersicht');
@@ -48,7 +48,7 @@ describe('new Translator(language)', function (){
}); });
it('should handle language keys in regular text with another language specified', function (done) { it('should handle language keys in regular text with another language specified', function (done) {
var translator = new Translator('de'); var translator = new Translator('de');
translator.translate('[[global:home]] test').then(function (translated) { translator.translate('[[global:home]] test').then(function (translated) {
assert.strictEqual(translated, 'Übersicht test'); assert.strictEqual(translated, 'Übersicht test');
@@ -57,7 +57,7 @@ describe('new Translator(language)', function (){
}); });
it('should handle language keys with parameters', function (done) { it('should handle language keys with parameters', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[global:pagination.out_of, 1, 5]]').then(function (translated) { translator.translate('[[global:pagination.out_of, 1, 5]]').then(function (translated) {
assert.strictEqual(translated, '1 out of 5'); assert.strictEqual(translated, '1 out of 5');
@@ -66,7 +66,7 @@ describe('new Translator(language)', function (){
}); });
it('should handle language keys inside language keys', function (done) { it('should handle language keys inside language keys', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[notifications:outgoing_link_message, [[global:guest]]]]').then(function (translated) { translator.translate('[[notifications:outgoing_link_message, [[global:guest]]]]').then(function (translated) {
assert.strictEqual(translated, 'You are now leaving Guest'); assert.strictEqual(translated, 'You are now leaving Guest');
@@ -75,7 +75,7 @@ describe('new Translator(language)', function (){
}); });
it('should handle language keys inside language keys with multiple parameters', function (done) { it('should handle language keys inside language keys with multiple parameters', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[notifications:user_posted_to, [[global:guest]], My Topic]]').then(function (translated) { translator.translate('[[notifications:user_posted_to, [[global:guest]], My Topic]]').then(function (translated) {
assert.strictEqual(translated, '<strong>Guest</strong> has posted a reply to: <strong>My Topic</strong>'); assert.strictEqual(translated, '<strong>Guest</strong> has posted a reply to: <strong>My Topic</strong>');
@@ -84,7 +84,7 @@ describe('new Translator(language)', function (){
}); });
it('should handle language keys inside language keys with all parameters as language keys', function (done) { it('should handle language keys inside language keys with all parameters as language keys', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[notifications:user_posted_to, [[global:guest]], [[global:guest]]]]').then(function (translated) { translator.translate('[[notifications:user_posted_to, [[global:guest]], [[global:guest]]]]').then(function (translated) {
assert.strictEqual(translated, '<strong>Guest</strong> has posted a reply to: <strong>Guest</strong>'); assert.strictEqual(translated, '<strong>Guest</strong> has posted a reply to: <strong>Guest</strong>');
@@ -93,7 +93,7 @@ describe('new Translator(language)', function (){
}); });
it('should properly handle parameters that contain square brackets', function (done) { it('should properly handle parameters that contain square brackets', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[global:pagination.out_of, [guest], [[global:home]]]]').then(function (translated) { translator.translate('[[global:pagination.out_of, [guest], [[global:home]]]]').then(function (translated) {
assert.strictEqual(translated, '[guest] out of Home'); assert.strictEqual(translated, '[guest] out of Home');
@@ -102,7 +102,7 @@ describe('new Translator(language)', function (){
}); });
it('should properly handle parameters that contain parentheses', function (done) { it('should properly handle parameters that contain parentheses', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
translator.translate('[[global:pagination.out_of, (foobar), [[global:home]]]]').then(function (translated) { translator.translate('[[global:pagination.out_of, (foobar), [[global:home]]]]').then(function (translated) {
assert.strictEqual(translated, '(foobar) out of Home'); assert.strictEqual(translated, '(foobar) out of Home');
@@ -111,7 +111,7 @@ describe('new Translator(language)', function (){
}); });
it('should not translate language key parameters with HTML in them', function (done) { it('should not translate language key parameters with HTML in them', function (done) {
var translator = new Translator('en_GB'); var translator = new Translator('en_GB');
var key = '[[global:403.login, <strong>test</strong>]]'; var key = '[[global:403.login, <strong>test</strong>]]';
translator.translate(key).then(function (translated) { translator.translate(key).then(function (translated) {

22
test/user.js
View File

@@ -3,20 +3,20 @@
var winston = require('winston'); var winston = require('winston');
var assert = require('assert'), var assert = require('assert');
async = require('async'), var async = require('async');
db = require('./mocks/databasemock'); var db = require('./mocks/databasemock');
var User = require('../src/user'), var User = require('../src/user');
Topics = require('../src/topics'), var Topics = require('../src/topics');
Categories = require('../src/categories'), var Categories = require('../src/categories');
Meta = require('../src/meta'), var Meta = require('../src/meta');
Password = require('../src/password'); var Password = require('../src/password');
describe('User', function () { describe('User', function () {
var userData, var userData;
testUid, var testUid;
testCid; var testCid;
before(function (done) { before(function (done) {
var groups = require('../src/groups'); var groups = require('../src/groups');